Fixed log buttons, replay pausing does not work yet properly, but issue / solution is now known

src/ui/MAVLinkSettingsWidget.cc

@@ -161,12 +161,14 @@ void MAVLinkSettingsWidget::chooseLogfileName()
 {
     QString fileName = QFileDialog::getSaveFileName(this, tr("Specify MAVLink log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("MAVLink Logfile (*.mavlink);;"));
 
-    if (!fileName.endsWith(".mavlink")) {
+    if (!fileName.endsWith(".mavlink"))
+    {
         fileName.append(".mavlink");
     }
 
     QFileInfo file(fileName);
-    if (file.exists() && !file.isWritable()) {
+    if (file.exists() && !file.isWritable())
+    {
         QMessageBox msgBox;
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setText(tr("The selected logfile is not writable"));
@@ -174,7 +176,9 @@ void MAVLinkSettingsWidget::chooseLogfileName()
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setDefaultButton(QMessageBox::Ok);
         msgBox.exec();
-    } else {
+    }
+    else
+    {
         updateLogfileName(fileName);
         protocol->setLogfileName(fileName);
     }
@@ -189,12 +193,15 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable)
     // Delete from all lists first
     UDPLink* firstUdp = NULL;
     QList<LinkInterface*> links = LinkManager::instance()->getLinksForProtocol(protocol);
-    foreach (LinkInterface* link, links) {
+    foreach (LinkInterface* link, links)
+    {
         UDPLink* udp = dynamic_cast<UDPLink*>(link);
-        if (udp) {
+        if (udp)
+        {
             if (!firstUdp) firstUdp = udp;
             // Remove current hosts
-            for (int i = 0; i < m_ui->droneOSComboBox->count(); ++i) {
+            for (int i = 0; i < m_ui->droneOSComboBox->count(); ++i)
+            {
                 QString oldHostString = m_ui->droneOSComboBox->itemText(i);
                 oldHostString = hostString.split(":").first();
                 udp->removeHost(oldHostString);
@@ -203,8 +210,10 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable)
     }
 
     // Re-add if enabled
-    if (enable) {
-        if (firstUdp) {
+    if (enable)
+    {
+        if (firstUdp)
+        {
             firstUdp->addHost(hostString);
         }
         // Set key

src/ui/QGCMAVLinkLogPlayer.cc

@@ -21,6 +21,7 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *pare
     mavlinkLogFormat(true),
     binaryBaudRate(57600),
     isPlaying(false),
+    currPacketCount(0),
     ui(new Ui::QGCMAVLinkLogPlayer)
 {
     ui->setupUi(this);
@@ -102,6 +103,7 @@ void QGCMAVLinkLogPlayer::play()
             loopTimer.start(interval*accelerationFactor);
         }
         isPlaying = true;
+        ui->logStatsLabel->setText(tr("Started playing.."));
         ui->playButton->setIcon(QIcon(":images/actions/media-playback-pause.svg"));
     }
     else
@@ -272,7 +274,8 @@ bool QGCMAVLinkLogPlayer::loadLogFile(const QString& file)
             minutes -= 60*hours;
 
             QString timelabel = tr("%1h:%2m:%3s").arg(hours, 2).arg(minutes, 2).arg(seconds, 2);
-            ui->logStatsLabel->setText(tr("%2 MB, %3 packets, %4").arg(logFileInfo.size()/1000000.0f, 0, 'f', 2).arg(logFileInfo.size()/(MAVLINK_MAX_PACKET_LEN+sizeof(quint64))).arg(timelabel));
+            currPacketCount = logFileInfo.size()/(MAVLINK_MAX_PACKET_LEN+sizeof(quint64));
+            ui->logStatsLabel->setText(tr("%2 MB, %3 packets, %4").arg(logFileInfo.size()/1000000.0f, 0, 'f', 2).arg(currPacketCount).arg(timelabel));
         }
         else
         {
@@ -302,6 +305,10 @@ bool QGCMAVLinkLogPlayer::loadLogFile(const QString& file)
             QString timelabel = tr("%1h:%2m:%3s").arg(hours, 2).arg(minutes, 2).arg(seconds, 2);
             ui->logStatsLabel->setText(tr("%2 MB, %4 at %5 KB/s").arg(logFileInfo.size()/1000000.0f, 0, 'f', 2).arg(timelabel).arg(binaryBaudRate/10.0f/1024.0f, 0, 'f', 2));
         }
+
+        // Reset current state
+        reset(0);
+
         return true;
     }
 }
@@ -458,7 +465,7 @@ void QGCMAVLinkLogPlayer::logLoop()
 
     // Update status label
     // Update progress bar
-    if (loopCounter % 40 == 0)
+    if (loopCounter % 40 == 0 || currPacketCount < 500)
     {
         QFileInfo logFileInfo(logFile);
         int progress = (ui->positionSlider->maximum()-ui->positionSlider->minimum())*(logFile.pos()/static_cast<float>(logFileInfo.size()));

src/ui/QGCMAVLinkLogPlayer.h

@@ -78,6 +78,7 @@ protected:
     bool mavlinkLogFormat;
     int binaryBaudRate;
     bool isPlaying;
+    unsigned int currPacketCount;
     static const int packetLen = MAVLINK_MAX_PACKET_LEN;
     static const int timeLen = sizeof(quint64);
     void changeEvent(QEvent *e);

src/ui/QGCToolBar.cc

@@ -45,7 +45,7 @@ QGCToolBar::QGCToolBar(QWidget *parent) :
     toggleLoggingAction = new QAction(QIcon(":"), "Logging", this);
     toggleLoggingAction->setCheckable(true);
     logReplayAction = new QAction(QIcon(":"), "Replay", this);
-    logReplayAction->setCheckable(true);
+    logReplayAction->setCheckable(false);
 
     addAction(toggleLoggingAction);
     addAction(logReplayAction);
@@ -143,7 +143,7 @@ void QGCToolBar::logging(bool enabled)
         }
 
         QFileInfo file(fileName);
-        if (file.exists() && !file.isWritable())
+        if ((file.exists() && !file.isWritable()))
         {
             QMessageBox msgBox;
             msgBox.setIcon(QMessageBox::Critical);