Browse Source

added function to FlightView to show the checklist if switching views from a view other than FlightView and if checklist should be shown

QGC4.4
Jacob Dahl 5 years ago
parent
commit
4a637d9098
  1. 12
      src/FlightDisplay/FlightDisplayView.qml
  2. 4
      src/ui/MainRootWindow.qml

12
src/FlightDisplay/FlightDisplayView.qml

@ -70,12 +70,6 @@ Item { @@ -70,12 +70,6 @@ Item {
readonly property string _mainIsMapKey: "MainFlyWindowIsMap"
readonly property string _PIPVisibleKey: "IsPIPVisible"
onVisibleChanged: {
if (activeVehicle && !_checklistComplete && _enforceChecklist) {
checklistPopupTimer.restart()
}
}
Timer {
id: checklistPopupTimer
interval: 1000
@ -122,6 +116,12 @@ Item { @@ -122,6 +116,12 @@ Item {
return true;
}
function showPreflightChecklistIfNeeded () {
if (activeVehicle && !_checklistComplete && _enforceChecklist) {
checklistPopupTimer.restart()
}
}
Connections {
target: _missionController
onResumeMissionUploadFail: guidedActionsController.confirmAction(guidedActionsController.actionResumeMissionUploadFail)

4
src/ui/MainRootWindow.qml

@ -113,6 +113,10 @@ ApplicationWindow { @@ -113,6 +113,10 @@ ApplicationWindow {
}
function showFlyView() {
if (!flightView.visible) {
flightView.showPreflightChecklistIfNeeded()
}
viewSwitch(false)
flightView.visible = true
}

Loading…
Cancel
Save