Commit 2feb0308 authored by Valentin Platzgummer's avatar Valentin Platzgummer

start mission issue (shown in inproper situations) fixed

parent bfd329e4
...@@ -759,7 +759,6 @@ QGCView { ...@@ -759,7 +759,6 @@ QGCView {
GuidedActionsController { GuidedActionsController {
id: guidedActionsController id: guidedActionsController
wimaController: wimaController wimaController: wimaController
wimaMenu: wimaMenu
missionController: _missionController missionController: _missionController
confirmDialog: guidedActionConfirm confirmDialog: guidedActionConfirm
actionList: guidedActionList actionList: guidedActionList
......
...@@ -29,7 +29,6 @@ Item { ...@@ -29,7 +29,6 @@ Item {
property var wimaController // must be provided by the user property var wimaController // must be provided by the user
property var planMasterController // must be provided by the user property var planMasterController // must be provided by the user
property var missionController // 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 bool _controllerValid: planMasterController !== undefined
property real _controllerProgressPct: _controllerValid ? planMasterController.missionController.progressPct : 0 property real _controllerProgressPct: _controllerValid ? planMasterController.missionController.progressPct : 0
...@@ -40,21 +39,14 @@ Item { ...@@ -40,21 +39,14 @@ Item {
anchors.fill: parent anchors.fill: parent
} }
Item {
id: _private
property bool missionReadyForStart: true
}
// Progress bar visibility // Progress bar visibility
on_ControllerProgressPctChanged: { on_ControllerProgressPctChanged: {
if (_controllerProgressPct === 1) { if (_controllerProgressPct === 1) {
uploadCompleteText.visible = true uploadCompleteText.visible = true
progressBar.visible = false progressBar.visible = false
_private.missionReadyForStart = true
} else if (_controllerProgressPct > 0) { } else if (_controllerProgressPct > 0) {
progressBar.visible = true progressBar.visible = true
uploadCompleteText.visible = false uploadCompleteText.visible = false
_private.missionReadyForStart = false
} }
} }
......
...@@ -28,7 +28,6 @@ Item { ...@@ -28,7 +28,6 @@ Item {
id: _root id: _root
property var wimaController property var wimaController
property var wimaMenu
property var missionController property var missionController
property var confirmDialog property var confirmDialog
property var actionList property var actionList
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment