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
c3a8400e
Commit
c3a8400e
authored
May 09, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Guided fixes
- Altitude slider not showing up - Continue mission not showing up in action list
parent
d32ab81d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+7
-1
GuidedActionList.qml
src/FlightDisplay/GuidedActionList.qml
+0
-4
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+3
-0
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
c3a8400e
...
...
@@ -417,6 +417,12 @@ QGCView {
action
:
_guidedController
.
actionStartMission
,
visible
:
_guidedController
.
showStartMission
},
{
title
:
_guidedController
.
continueMissionTitle
,
text
:
_guidedController
.
continueMissionMessage
,
action
:
_guidedController
.
actionContinueMission
,
visible
:
_guidedController
.
showContinueMission
},
{
title
:
_guidedController
.
resumeMissionTitle
,
text
:
_guidedController
.
resumeMissionMessage
,
...
...
@@ -502,6 +508,7 @@ QGCView {
id
:
guidedActionsController
missionController
:
_missionController
confirmDialog
:
guidedActionConfirm
altitudeSlider
:
_altitudeSlider
z
:
_flightVideoPipControl
.
z
+
1
onShowStartMissionChanged
:
{
...
...
@@ -552,7 +559,6 @@ QGCView {
anchors.bottom
:
parent
.
bottom
anchors.horizontalCenter
:
parent
.
horizontalCenter
guidedController
:
_guidedController
altitudeSlider
:
_altitudeSlider
}
//-- Altitude slider
...
...
src/FlightDisplay/GuidedActionList.qml
View file @
c3a8400e
...
...
@@ -86,10 +86,6 @@ Rectangle {
text
:
modelData
.
title
onClicked
:
{
if
(
modelData
.
action
===
guidedController
.
actionChangeAlt
)
{
altitudeSlider
.
reset
()
altitudeSlider
.
visible
=
true
}
_root
.
visible
=
false
guidedController
.
confirmAction
(
modelData
.
action
)
}
...
...
src/FlightDisplay/GuidedActionsController.qml
View file @
c3a8400e
...
...
@@ -29,6 +29,7 @@ Item {
property
var
missionController
property
var
confirmDialog
property
var
altitudeSlider
readonly
property
string
emergencyStopTitle
:
qsTr
(
"
Emergency Stop
"
)
readonly
property
string
armTitle
:
qsTr
(
"
Arm
"
)
...
...
@@ -188,6 +189,8 @@ Item {
confirmDialog
.
title
=
changeAltTitle
confirmDialog
.
message
=
changeAltMessage
confirmDialog
.
hideTrigger
=
Qt
.
binding
(
function
()
{
return
!
showChangeAlt
})
altitudeSlider
.
reset
()
altitudeSlider
.
visible
=
true
break
;
case
actionGoto
:
confirmDialog
.
title
=
gotoTitle
...
...
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