Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
14fff3e6
Unverified
Commit
14fff3e6
authored
Apr 05, 2018
by
Don Gagne
Committed by
GitHub
Apr 05, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6310 from DonLakeFlyer/PauseChangeAlt
Allow altitude change with Pause command
parents
c6679b6a
79173dcb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+4
-1
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
14fff3e6
...
...
@@ -66,7 +66,7 @@ Item {
property
string
setWaypointMessage
:
qsTr
(
"
Adjust current waypoint to %1.
"
).
arg
(
_actionData
)
readonly
property
string
orbitMessage
:
qsTr
(
"
Orbit the vehicle around the current location.
"
)
readonly
property
string
landAbortMessage
:
qsTr
(
"
Abort the landing sequence.
"
)
readonly
property
string
pauseMessage
:
qsTr
(
"
Pause the vehicle at it's current position.
"
)
readonly
property
string
pauseMessage
:
qsTr
(
"
Pause the vehicle at it's current position
, adjusting altitude up or down as needed
.
"
)
readonly
property
string
mvPauseMessage
:
qsTr
(
"
Pause all vehicles at their current position.
"
)
readonly
property
string
vtolTransitionFwdMessage
:
qsTr
(
"
Transition VTOL to fixed wing flight.
"
)
readonly
property
string
vtolTransitionMRMessage
:
qsTr
(
"
Transition VTOL to multi-rotor flight.
"
)
...
...
@@ -295,6 +295,8 @@ Item {
confirmDialog
.
title
=
pauseTitle
confirmDialog
.
message
=
pauseMessage
confirmDialog
.
hideTrigger
=
Qt
.
binding
(
function
()
{
return
!
showPause
})
altitudeSlider
.
reset
()
altitudeSlider
.
visible
=
true
break
;
case
actionMVPause
:
confirmDialog
.
title
=
pauseTitle
...
...
@@ -376,6 +378,7 @@ Item {
break
case
actionPause
:
_activeVehicle
.
pauseVehicle
()
_activeVehicle
.
guidedModeChangeAltitude
(
actionData
)
break
case
actionMVPause
:
rgVehicle
=
QGroundControl
.
multiVehicleManager
.
vehicles
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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