Browse Source

Guided fixes

- Altitude slider not showing up
- Continue mission not showing up in action list
QGC4.4
Don Gagne 8 years ago
parent
commit
c3a8400e54
  1. 8
      src/FlightDisplay/FlightDisplayView.qml
  2. 4
      src/FlightDisplay/GuidedActionList.qml
  3. 3
      src/FlightDisplay/GuidedActionsController.qml

8
src/FlightDisplay/FlightDisplayView.qml

@ -418,6 +418,12 @@ QGCView {
visible: _guidedController.showStartMission visible: _guidedController.showStartMission
}, },
{ {
title: _guidedController.continueMissionTitle,
text: _guidedController.continueMissionMessage,
action: _guidedController.actionContinueMission,
visible: _guidedController.showContinueMission
},
{
title: _guidedController.resumeMissionTitle, title: _guidedController.resumeMissionTitle,
text: _guidedController.resumeMissionMessage, text: _guidedController.resumeMissionMessage,
action: _guidedController.actionResumeMission, action: _guidedController.actionResumeMission,
@ -502,6 +508,7 @@ QGCView {
id: guidedActionsController id: guidedActionsController
missionController: _missionController missionController: _missionController
confirmDialog: guidedActionConfirm confirmDialog: guidedActionConfirm
altitudeSlider: _altitudeSlider
z: _flightVideoPipControl.z + 1 z: _flightVideoPipControl.z + 1
onShowStartMissionChanged: { onShowStartMissionChanged: {
@ -552,7 +559,6 @@ QGCView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
guidedController: _guidedController guidedController: _guidedController
altitudeSlider: _altitudeSlider
} }
//-- Altitude slider //-- Altitude slider

4
src/FlightDisplay/GuidedActionList.qml

@ -86,10 +86,6 @@ Rectangle {
text: modelData.title text: modelData.title
onClicked: { onClicked: {
if (modelData.action === guidedController.actionChangeAlt) {
altitudeSlider.reset()
altitudeSlider.visible = true
}
_root.visible = false _root.visible = false
guidedController.confirmAction(modelData.action) guidedController.confirmAction(modelData.action)
} }

3
src/FlightDisplay/GuidedActionsController.qml

@ -29,6 +29,7 @@ Item {
property var missionController property var missionController
property var confirmDialog property var confirmDialog
property var altitudeSlider
readonly property string emergencyStopTitle: qsTr("Emergency Stop") readonly property string emergencyStopTitle: qsTr("Emergency Stop")
readonly property string armTitle: qsTr("Arm") readonly property string armTitle: qsTr("Arm")
@ -188,6 +189,8 @@ Item {
confirmDialog.title = changeAltTitle confirmDialog.title = changeAltTitle
confirmDialog.message = changeAltMessage confirmDialog.message = changeAltMessage
confirmDialog.hideTrigger = Qt.binding(function() { return !showChangeAlt }) confirmDialog.hideTrigger = Qt.binding(function() { return !showChangeAlt })
altitudeSlider.reset()
altitudeSlider.visible = true
break; break;
case actionGoto: case actionGoto:
confirmDialog.title = gotoTitle confirmDialog.title = gotoTitle

Loading…
Cancel
Save