From a11ca3dae2fe0c94cba599fb0ab9b9e60daef172 Mon Sep 17 00:00:00 2001 From: lm Date: Sun, 13 Feb 2011 17:32:18 +0100 Subject: [PATCH] Minor changes --- src/uas/UAS.cc | 2 ++ src/ui/QGCSensorSettingsWidget.cc | 1 + src/ui/map3D/QGCGoogleEarthView.cc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 17959d6..363b0a4 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -605,6 +605,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) { emit globalPositionChanged(this, pos.lat, pos.lon, pos.alt, time); emit valueChanged(uasId, "gps speed", "m/s", pos.v, time); + positionLock = true; // Check for NaN int alt = pos.alt; @@ -645,6 +646,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) { emit globalPositionChanged(this, pos.lat/(double)1E7, pos.lon/(double)1E7, pos.alt/1000.0, time); emit valueChanged(uasId, "gps speed", "m/s", pos.v, time); + positionLock = true; // Check for NaN int alt = pos.alt; diff --git a/src/ui/QGCSensorSettingsWidget.cc b/src/ui/QGCSensorSettingsWidget.cc index 68b55ac..0083b9f 100644 --- a/src/ui/QGCSensorSettingsWidget.cc +++ b/src/ui/QGCSensorSettingsWidget.cc @@ -37,6 +37,7 @@ QGCSensorSettingsWidget::QGCSensorSettingsWidget(UASInterface* uas, QWidget *par ui(new Ui::QGCSensorSettingsWidget) { ui->setupUi(this); + // FIXME James Goppert // XXX: This might be a bad idea sending a message every time the value changes connect(ui->spinBox_rawSensor, SIGNAL(valueChanged(int)), mav, SLOT(enableRawSensorDataTransmission(int))); connect(ui->spinBox_controller, SIGNAL(valueChanged(int)), mav, SLOT(enableRawControllerDataTransmission(int))); diff --git a/src/ui/map3D/QGCGoogleEarthView.cc b/src/ui/map3D/QGCGoogleEarthView.cc index 36f8075..dc05365 100644 --- a/src/ui/map3D/QGCGoogleEarthView.cc +++ b/src/ui/map3D/QGCGoogleEarthView.cc @@ -214,7 +214,7 @@ void QGCGoogleEarthView::updateWaypointList(int uas) void QGCGoogleEarthView::updateGlobalPosition(UASInterface* uas, double lat, double lon, double alt, quint64 usec) { Q_UNUSED(usec); - javaScript(QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15)); + javaScript(QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 18).arg(lon, 0, 'f', 18).arg(alt, 0, 'f', 15)); //qDebug() << QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15); }