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
2d49ef53
Commit
2d49ef53
authored
Apr 03, 2016
by
Don Gagne
Browse files
Fix null _activeVehicle references
parent
e68c93dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
2d49ef53
...
...
@@ -445,25 +445,25 @@ Item {
spacing
:
_margins
QGCButton
{
text
:
_activeVehicle
.
armed
?
(
_activeVehicle
.
flying
?
"
Emergency Stop
"
:
"
Disarm
"
)
:
"
Arm
"
text
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
?
(
_activeVehicle
.
flying
?
"
Emergency Stop
"
:
"
Disarm
"
)
:
"
Arm
"
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
armed
?
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmEmergencyStop
:
_guidedModeBar
.
confirmDisarm
)
:
_guidedModeBar
.
confirmArm
)
}
QGCButton
{
text
:
"
RTL
"
visible
:
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmHome
)
}
QGCButton
{
text
:
_activeVehicle
.
flying
?
"
Land
"
:
"
Takeoff
"
visible
:
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
text
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
?
"
Land
"
:
"
Takeoff
"
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmLand
:
_guidedModeBar
.
confirmTakeoff
)
}
QGCButton
{
text
:
"
Pause
"
visible
:
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
visible
:
_activeVehicle
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
onClicked
:
{
guidedModeHideTimer
.
restart
()
_activeVehicle
.
pauseVehicle
()
...
...
@@ -472,13 +472,14 @@ Item {
QGCButton
{
text
:
"
Change Altitude
"
visible
:
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmChangeAlt
)
}
}
// Row
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
color
:
qgcPal
.
button
text
:
"
Click in map to move vehicle
"
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedMode
&&
_activeVehicle
.
flying
}
...
...
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