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
d6890778
Unverified
Commit
d6890778
authored
Jun 30, 2019
by
Gus Grubba
Committed by
GitHub
Jun 30, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7557 from mavlink/altitudeSlider
Guided Altitude Slider
parents
885656cb
1f7c77a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
GuidedAltitudeSlider.qml
src/FlightDisplay/GuidedAltitudeSlider.qml
+3
-2
QGCSlider.qml
src/QmlControls/QGCSlider.qml
+0
-2
No files found.
src/FlightDisplay/GuidedAltitudeSlider.qml
View file @
d6890778
...
...
@@ -26,6 +26,7 @@ Rectangle {
property
bool
_fixedWing
:
activeVehicle
?
activeVehicle
.
fixedWing
:
false
property
real
_sliderMaxAlt
:
_flyViewSettings
?
_flyViewSettings
.
guidedMaximumAltitude
.
rawValue
:
0
property
real
_sliderMinAlt
:
_flyViewSettings
?
_flyViewSettings
.
guidedMinimumAltitude
.
rawValue
:
0
property
bool
_flying
:
activeVehicle
?
activeVehicle
.
flying
:
false
function
reset
()
{
altSlider
.
value
=
0
...
...
@@ -89,14 +90,14 @@ Rectangle {
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
orientation
:
Qt
.
Vertical
minimumValue
:
-
1
minimumValue
:
_flying
?
-
1
:
0
maximumValue
:
1
zeroCentered
:
true
rotation
:
180
// We want slide up to be positive values
transform
:
Rotation
{
origin.x
:
altSlider
.
width
/
2
origin.x
:
altSlider
.
width
/
2
origin.y
:
altSlider
.
height
/
2
angle
:
180
}
...
...
src/QmlControls/QGCSlider.qml
View file @
d6890778
...
...
@@ -23,8 +23,6 @@ Slider {
property
bool
zeroCentered
:
false
property
bool
displayValue
:
false
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
enabled
}
style
:
SliderStyle
{
groove
:
Item
{
anchors.verticalCenter
:
parent
.
verticalCenter
...
...
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