Browse Source

Merge pull request #6310 from DonLakeFlyer/PauseChangeAlt

Allow altitude change with Pause command
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
14fff3e6e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/FlightDisplay/GuidedActionsController.qml

5
src/FlightDisplay/GuidedActionsController.qml

@ -66,7 +66,7 @@ Item { @@ -66,7 +66,7 @@ Item {
property string setWaypointMessage: qsTr("Adjust current waypoint to %1.").arg(_actionData)
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 pauseMessage: qsTr("Pause the vehicle at it's current position, adjusting altitude up or down as needed.")
readonly property string mvPauseMessage: qsTr("Pause all vehicles at their current position.")
readonly property string vtolTransitionFwdMessage: qsTr("Transition VTOL to fixed wing flight.")
readonly property string vtolTransitionMRMessage: qsTr("Transition VTOL to multi-rotor flight.")
@ -295,6 +295,8 @@ Item { @@ -295,6 +295,8 @@ Item {
confirmDialog.title = pauseTitle
confirmDialog.message = pauseMessage
confirmDialog.hideTrigger = Qt.binding(function() { return !showPause })
altitudeSlider.reset()
altitudeSlider.visible = true
break;
case actionMVPause:
confirmDialog.title = pauseTitle
@ -376,6 +378,7 @@ Item { @@ -376,6 +378,7 @@ Item {
break
case actionPause:
_activeVehicle.pauseVehicle()
_activeVehicle.guidedModeChangeAltitude(actionData)
break
case actionMVPause:
rgVehicle = QGroundControl.multiVehicleManager.vehicles

Loading…
Cancel
Save