Commit 27aa9098 authored by Don Gagne's avatar Don Gagne

Change position to vehicle position

parent 556599a3
...@@ -112,6 +112,17 @@ QGCViewDialog { ...@@ -112,6 +112,17 @@ QGCViewDialog {
reject() 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 } // Column
} // QGCFlickable } // QGCFlickable
} // QGCViewDialog } // QGCViewDialog
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "EditPositionDialogController.h" #include "EditPositionDialogController.h"
#include "QGCGeo.h" #include "QGCGeo.h"
#include "QGCApplication.h"
const char* EditPositionDialogController::_latitudeFactName = "Latitude"; const char* EditPositionDialogController::_latitudeFactName = "Latitude";
const char* EditPositionDialogController::_longitudeFactName = "Longitude"; 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; qDebug() << _eastingFact.rawValue().toDouble() << _northingFact.rawValue().toDouble() << _zoneFact.rawValue().toInt() << (_hemisphereFact.rawValue().toInt() == 1) << _coordinate;
emit coordinateChanged(_coordinate); emit coordinateChanged(_coordinate);
} }
void EditPositionDialogController::setFromVehicle(void)
{
_coordinate = qgcApp()->toolbox()->multiVehicleManager()->activeVehicle()->coordinate();
emit coordinateChanged(_coordinate);
}
...@@ -42,6 +42,7 @@ public: ...@@ -42,6 +42,7 @@ public:
Q_INVOKABLE void initValues(void); Q_INVOKABLE void initValues(void);
Q_INVOKABLE void setFromGeo(void); Q_INVOKABLE void setFromGeo(void);
Q_INVOKABLE void setFromUTM(void); Q_INVOKABLE void setFromUTM(void);
Q_INVOKABLE void setFromVehicle(void);
signals: signals:
void coordinateChanged(QGeoCoordinate coordinate); void coordinateChanged(QGeoCoordinate coordinate);
......
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