diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc index 5462cf9a3e4d8f5ecf9936f117261b03a1a34971..66a9d57a321517b7cfc4a7f88fb711276ff3e70e 100644 --- a/src/uas/UASWaypointManager.cc +++ b/src/uas/UASWaypointManager.cc @@ -201,7 +201,9 @@ void UASWaypointManager::handleWaypoint(quint8 systemId, quint8 compId, mavlink_ protocol_timer.stop(); emit readGlobalWPFromUAS(false); - emit updateStatusString("done."); + QTime time = QTime::currentTime(); + QString timeString = time.toString(); + emit updateStatusString(tr("done. (updated at %1)").arg(timeString)); } } else { diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc index c3ba87c26052450b27d411b111a3c2c35578140f..077425ef4e38e43dbcea63bff0d3b2c5639b0f56 100644 --- a/src/ui/QGCParamWidget.cc +++ b/src/ui/QGCParamWidget.cc @@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include +#include #include #include #include @@ -444,7 +445,18 @@ void QGCParamWidget::addParameter(int uas, int component, int paramCount, int pa } QString val = QString("%1").arg(value.toFloat(), 5, 'f', 1, QChar(' ')); //statusLabel->setText(tr("OK: %1 %2 #%3/%4, %5 miss").arg(parameterName).arg(val).arg(paramId+1).arg(paramCount).arg(missCount)); - statusLabel->setText(tr("OK: %1 %2 (%3/%4)").arg(parameterName).arg(val).arg(paramCount-missCount).arg(paramCount)); + if (missCount == 0) + { + // Transmission done + QTime time = QTime::currentTime(); + QString timeString = time.toString(); + statusLabel->setText(tr("All received. (updated at %1)").arg(timeString)); + } + else + { + // Transmission in progress + statusLabel->setText(tr("OK: %1 %2 (%3/%4)").arg(parameterName).arg(val).arg(paramCount-missCount).arg(paramCount)); + } } // Check if last parameter was received diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc index 8f979d26a84651dee5db1d181f47ddd0d53503bb..1996833b4bc884e84f055b08713a9c537aeaf092 100644 --- a/src/ui/QGCToolBar.cc +++ b/src/ui/QGCToolBar.cc @@ -134,7 +134,7 @@ void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms) { toolBarTimeoutLabel->setStyleSheet(QString("QLabel { margin: 0px 2px; font: 14px; color: %1; background-color: %2; }").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.dark(250).name())); } - toolBarTimeoutLabel->setText(tr("CONNECTION LOST: %1 s").arg((ms / 1000.0f), 2, 'f', 1)); + toolBarTimeoutLabel->setText(tr("CONNECTION LOST: %1 s").arg((ms / 1000.0f), 2, 'f', 1, ' ')); } else {