Browse Source

Change position to vehicle position

QGC4.4
Don Gagne 7 years ago
parent
commit
27aa9098d1
  1. 11
      src/QmlControls/EditPositionDialog.qml
  2. 8
      src/QmlControls/EditPositionDialogController.cc
  3. 1
      src/QmlControls/EditPositionDialogController.h

11
src/QmlControls/EditPositionDialog.qml

@ -112,6 +112,17 @@ QGCViewDialog { @@ -112,6 +112,17 @@ QGCViewDialog {
reject()
}
}
QGCButton {
anchors.right: parent.right
text: qsTr("Set From Vehicle Position")
visible: QGroundControl.multiVehicleManager.activeVehicle && QGroundControl.multiVehicleManager.activeVehicle.coordinate.isValid
onClicked: {
controller.setFromVehicle()
reject()
}
}
} // Column
} // QGCFlickable
} // QGCViewDialog

8
src/QmlControls/EditPositionDialogController.cc

@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
#include "EditPositionDialogController.h"
#include "QGCGeo.h"
#include "QGCApplication.h"
const char* EditPositionDialogController::_latitudeFactName = "Latitude";
const char* EditPositionDialogController::_longitudeFactName = "Longitude";
@ -74,3 +75,10 @@ void EditPositionDialogController::setFromUTM(void) @@ -74,3 +75,10 @@ void EditPositionDialogController::setFromUTM(void)
qDebug() << _eastingFact.rawValue().toDouble() << _northingFact.rawValue().toDouble() << _zoneFact.rawValue().toInt() << (_hemisphereFact.rawValue().toInt() == 1) << _coordinate;
emit coordinateChanged(_coordinate);
}
void EditPositionDialogController::setFromVehicle(void)
{
_coordinate = qgcApp()->toolbox()->multiVehicleManager()->activeVehicle()->coordinate();
emit coordinateChanged(_coordinate);
}

1
src/QmlControls/EditPositionDialogController.h

@ -42,6 +42,7 @@ public: @@ -42,6 +42,7 @@ public:
Q_INVOKABLE void initValues(void);
Q_INVOKABLE void setFromGeo(void);
Q_INVOKABLE void setFromUTM(void);
Q_INVOKABLE void setFromVehicle(void);
signals:
void coordinateChanged(QGeoCoordinate coordinate);

Loading…
Cancel
Save