Skip to content

Q
qgroundcontrol
Commit a6383238 authored by Donald Gagne's avatar Donald Gagne
Browse files
Options

Qml warning fixes

parent 1723a2d2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
src/MissionEditor/PlanToolBar.qml
View file @ a6383238
...@@ -25,15 +25,17 @@ Rectangle { ...@@ -25,15 +25,17 @@ Rectangle {
property var missionController property var missionController
property var currentMissionItem ///< Mission item to display status for property var currentMissionItem ///< Mission item to display status for
property var missionItems: missionController.visualItems property var missionItems: _controllerValid ? missionController.visualItems : undefined
property real missionDistance: missionController.missionDistance property real missionDistance: _controllerValid ? missionController.missionDistance : NaN
property real missionTime: missionController.missionTime property real missionTime: _controllerValid ? missionController.missionTime : NaN
property real missionMaxTelemetry: missionController.missionMaxTelemetry property real missionMaxTelemetry: _controllerValid ? missionController.missionMaxTelemetry : NaN
property bool missionDirty: _controllerValid ? missionController.dirty : false
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool _statusValid: currentMissionItem != undefined property bool _statusValid: currentMissionItem != undefined
property bool _missionValid: missionItems != undefined property bool _missionValid: missionItems != undefined
property bool _controllerValid: missionController != undefined
property real _distance: _statusValid ? currentMissionItem.distance : NaN property real _distance: _statusValid ? currentMissionItem.distance : NaN
property real _altDifference: _statusValid ? currentMissionItem.altDifference : NaN property real _altDifference: _statusValid ? currentMissionItem.altDifference : NaN
...@@ -184,7 +186,7 @@ Rectangle { ...@@ -184,7 +186,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: _activeVehicle ? qsTr("Upload") : qsTr("Save") text: _activeVehicle ? qsTr("Upload") : qsTr("Save")
visible: missionController.dirty visible: missionDirty
primary: true primary: true
onClicked: { onClicked: {
...@@ -197,7 +199,7 @@ Rectangle { ...@@ -197,7 +199,7 @@ Rectangle {
NumberAnimation on opacity { NumberAnimation on opacity {
id: opacityAnimation id: opacityAnimation
running: missionController.dirty running: missionDirty
from: 0.5 from: 0.5
to: 1.0 to: 1.0
loops: Animation.Infinite loops: Animation.Infinite
......
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