zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix global position display in UAS widget 

Signed-off-by: kai <kai@uav-flightresearch.com>
QGC4.4
kai 10 years ago
parent
1f4577f203
commit
6c66597703
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/ui/uas/UASView.cc
  2. 2
      src/ui/uas/UASView.h

4
src/ui/uas/UASView.cc
Unescape View File

@ -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()
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);
} }

2
src/ui/uas/UASView.h
Unescape View File

@ -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 */

Write Preview
Loading…
Cancel
Save