From 6c66597703f0ed1a289e65e9cd5838fd46081504 Mon Sep 17 00:00:00 2001 From: kai Date: Sun, 30 Aug 2015 18:54:15 +1000 Subject: [PATCH] fix global position display in UAS widget Signed-off-by: kai --- src/ui/uas/UASView.cc | 4 ++-- src/ui/uas/UASView.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc index 47c69a463..72d82704e 100644 --- a/src/ui/uas/UASView.cc +++ b/src/ui/uas/UASView.cc @@ -364,7 +364,7 @@ void UASView::updateLocalPosition(UASInterface* uas, double x, double y, double localFrame = true; } -void UASView::updateGlobalPosition(UASInterface* uas, double lon, double lat, double altAMSL, double altWGS84, quint64 usec) +void UASView::updateGlobalPosition(UASInterface* uas, double lat, double lon, double altAMSL, double altWGS84, quint64 usec) { Q_UNUSED(uas); Q_UNUSED(usec); @@ -579,7 +579,7 @@ void UASView::refresh() lonIndicator = "W"; } - globalPosition = globalPosition.sprintf("%05.1f%s %05.1f%s %06.1f m", lon, lonIndicator.toStdString().c_str(), lat, latIndicator.toStdString().c_str(), alt); + globalPosition = globalPosition.sprintf("%6.2f%s %6.2f%s %6.1f m", fabs(lon), lonIndicator.toStdString().c_str(), fabs(lat), latIndicator.toStdString().c_str(), alt); m_ui->positionLabel->setText(globalPosition); } diff --git a/src/ui/uas/UASView.h b/src/ui/uas/UASView.h index f46f03154..579466f80 100644 --- a/src/ui/uas/UASView.h +++ b/src/ui/uas/UASView.h @@ -61,7 +61,7 @@ public slots: void updateThrust(UASInterface* uas, double thrust); void updateBattery(UASInterface* uas, double voltage, double current, double percent, int seconds); void updateLocalPosition(UASInterface*, double x, double y, double z, quint64 usec); - void updateGlobalPosition(UASInterface*, double lon, double lat, double altAMSL, double altWGS84, quint64 usec); + void updateGlobalPosition(UASInterface*, double lat, double lon, double altAMSL, double altWGS84, quint64 usec); void updateSpeed(UASInterface*, double x, double y, double z, quint64 usec); void updateState(UASInterface*, QString uasState, QString stateDescription); /** @brief Update the MAV mode */ -- 2.22.0