From a63832388467640f39e2f5d1c9112b8384db0dfc Mon Sep 17 00:00:00 2001 From: Donald Gagne Date: Fri, 24 Mar 2017 21:13:37 -0700 Subject: [PATCH] Qml warning fixes --- src/MissionEditor/PlanToolBar.qml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/MissionEditor/PlanToolBar.qml b/src/MissionEditor/PlanToolBar.qml index 3105d80c4..64b912f29 100644 --- a/src/MissionEditor/PlanToolBar.qml +++ b/src/MissionEditor/PlanToolBar.qml @@ -25,15 +25,17 @@ Rectangle { property var missionController property var currentMissionItem ///< Mission item to display status for - property var missionItems: missionController.visualItems - property real missionDistance: missionController.missionDistance - property real missionTime: missionController.missionTime - property real missionMaxTelemetry: missionController.missionMaxTelemetry + property var missionItems: _controllerValid ? missionController.visualItems : undefined + property real missionDistance: _controllerValid ? missionController.missionDistance : NaN + property real missionTime: _controllerValid ? missionController.missionTime : NaN + property real missionMaxTelemetry: _controllerValid ? missionController.missionMaxTelemetry : NaN + property bool missionDirty: _controllerValid ? missionController.dirty : false property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property bool _statusValid: currentMissionItem != undefined property bool _missionValid: missionItems != undefined + property bool _controllerValid: missionController != undefined property real _distance: _statusValid ? currentMissionItem.distance : NaN property real _altDifference: _statusValid ? currentMissionItem.altDifference : NaN @@ -184,7 +186,7 @@ Rectangle { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter text: _activeVehicle ? qsTr("Upload") : qsTr("Save") - visible: missionController.dirty + visible: missionDirty primary: true onClicked: { @@ -197,7 +199,7 @@ Rectangle { NumberAnimation on opacity { id: opacityAnimation - running: missionController.dirty + running: missionDirty from: 0.5 to: 1.0 loops: Animation.Infinite -- 2.22.0