Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b7d5832b
Commit
b7d5832b
authored
Mar 25, 2017
by
Don Gagne
Committed by
GitHub
Mar 25, 2017
Browse files
Merge pull request #4851 from DonLakeFlyer/PlanToolbarQml
Plan toolbar: Qml warning fixes
parents
55db063c
a6383238
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/MissionEditor/PlanToolBar.qml
View file @
b7d5832b
...
...
@@ -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
:
mission
Controller
.
d
irty
visible
:
mission
D
irty
primary
:
true
onClicked
:
{
...
...
@@ -197,7 +199,7 @@ Rectangle {
NumberAnimation
on
opacity
{
id
:
opacityAnimation
running
:
mission
Controller
.
d
irty
running
:
mission
D
irty
from
:
0.5
to
:
1.0
loops
:
Animation
.
Infinite
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment