Skip to content

Q
qgroundcontrol
Commit 6c665977 authored by kai's avatar kai
Browse files
Options

fix global position display in UAS widget 

Signed-off-by: 's avatarkai <kai@uav-flightresearch.com>
parent 1f4577f2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/ui/uas/UASView.cc
View file @ 6c665977
...@@ -364,7 +364,7 @@ void UASView::updateLocalPosition(UASInterface* uas, double x, double y, double ...@@ -364,7 +364,7 @@ void UASView::updateLocalPosition(UASInterface* uas, double x, double y, double
localFrame = true; 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(uas);
Q_UNUSED(usec); Q_UNUSED(usec);
...@@ -579,7 +579,7 @@ void UASView::refresh() ...@@ -579,7 +579,7 @@ void UASView::refresh()
lonIndicator = "W"; 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); m_ui->positionLabel->setText(globalPosition);
} }
......
src/ui/uas/UASView.h
View file @ 6c665977
...@@ -61,7 +61,7 @@ public slots: ...@@ -61,7 +61,7 @@ public slots:
void updateThrust(UASInterface* uas, double thrust); void updateThrust(UASInterface* uas, double thrust);
void updateBattery(UASInterface* uas, double voltage, double current, double percent, int seconds); void updateBattery(UASInterface* uas, double voltage, double current, double percent, int seconds);
void updateLocalPosition(UASInterface*, double x, double y, double z, quint64 usec); 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 updateSpeed(UASInterface*, double x, double y, double z, quint64 usec);
void updateState(UASInterface*, QString uasState, QString stateDescription); void updateState(UASInterface*, QString uasState, QString stateDescription);
/** @brief Update the MAV mode */ /** @brief Update the MAV mode */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment