Browse Source

fix global position display in UAS widget

Signed-off-by: kai <kai@uav-flightresearch.com>
QGC4.4
kai 10 years ago
parent
commit
6c66597703
  1. 4
      src/ui/uas/UASView.cc
  2. 2
      src/ui/uas/UASView.h

4
src/ui/uas/UASView.cc

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

2
src/ui/uas/UASView.h

@ -61,7 +61,7 @@ public slots: @@ -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 */

Loading…
Cancel
Save