From 0690559b7a134665a127f64811c03a143b91ad02 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 18 Jul 2017 13:49:17 -0700 Subject: [PATCH] Add support for multi-vehicle variants --- src/FlightDisplay/GuidedActionsController.qml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index 5aafc3633..cf046f926 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -64,6 +64,7 @@ Item { readonly property string orbitMessage: qsTr("Orbit the vehicle around the current location.") readonly property string landAbortMessage: qsTr("Abort the landing sequence.") readonly property string pauseMessage: qsTr("Pause the vehicle at it's current position.") + readonly property string mvPauseMessage: qsTr("Pause all vehicles at their current position.") readonly property int actionRTL: 1 readonly property int actionLand: 2 @@ -81,6 +82,8 @@ Item { readonly property int actionResumeMission: 14 readonly property int actionResumeMissionReady: 15 readonly property int actionPause: 16 + readonly property int actionMVPause: 17 + readonly property int actionMVStartMission: 18 property bool showEmergenyStop: !_hideEmergenyStop && _activeVehicle && _vehicleArmed && _vehicleFlying property bool showArm: _activeVehicle && !_vehicleArmed @@ -195,6 +198,11 @@ Item { confirmDialog.message = startMissionMessage confirmDialog.hideTrigger = Qt.binding(function() { return !showStartMission }) break; + case actionMVStartMission: + confirmDialog.title = startMissionTitle + confirmDialog.message = startMissionMessage + confirmDialog.hideTrigger = true + break; case actionContinueMission: confirmDialog.title = continueMissionTitle confirmDialog.message = continueMissionMessage @@ -251,6 +259,11 @@ Item { confirmDialog.message = pauseMessage confirmDialog.hideTrigger = Qt.binding(function() { return !showPause }) break; + case actionMVPause: + confirmDialog.title = pauseTitle + confirmDialog.message = mvPauseMessage + confirmDialog.hideTrigger = true + break; default: console.warn("Unknown actionCode", actionCode) return @@ -281,6 +294,13 @@ Item { case actionContinueMission: _activeVehicle.startMission() break + case actionMVStartMission: + var rgVehicle = QGroundControl.multiVehicleManager.vehicles + for (var i=0; i