From 2feb0308f603df5e0397bcb5f43553721711ae54 Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Thu, 27 Feb 2020 16:59:26 +0100 Subject: [PATCH] start mission issue (shown in inproper situations) fixed --- src/FlightDisplay/FlightDisplayView.qml | 1 - src/FlightDisplay/FlightDisplayWimaMenu.qml | 8 -------- src/FlightDisplay/GuidedActionsController.qml | 1 - 3 files changed, 10 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 65c9055e6..0b7599e94 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -759,7 +759,6 @@ QGCView { GuidedActionsController { id: guidedActionsController wimaController: wimaController - wimaMenu: wimaMenu missionController: _missionController confirmDialog: guidedActionConfirm actionList: guidedActionList diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml index 24ba8dad8..fa8da9452 100644 --- a/src/FlightDisplay/FlightDisplayWimaMenu.qml +++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml @@ -29,7 +29,6 @@ Item { property var wimaController // must be provided by the user property var planMasterController // must be provided by the user property var missionController // must be provided by the user - readonly property alias missionReadyForStart: _private.missionReadyForStart property bool _controllerValid: planMasterController !== undefined property real _controllerProgressPct: _controllerValid ? planMasterController.missionController.progressPct : 0 @@ -40,21 +39,14 @@ Item { anchors.fill: parent } - Item { - id: _private - property bool missionReadyForStart: true - } - // Progress bar visibility on_ControllerProgressPctChanged: { if (_controllerProgressPct === 1) { uploadCompleteText.visible = true progressBar.visible = false - _private.missionReadyForStart = true } else if (_controllerProgressPct > 0) { progressBar.visible = true uploadCompleteText.visible = false - _private.missionReadyForStart = false } } diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index d69bce12d..0436473e9 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -28,7 +28,6 @@ Item { id: _root property var wimaController - property var wimaMenu property var missionController property var confirmDialog property var actionList -- 2.22.0