Browse Source

Merge pull request #7557 from mavlink/altitudeSlider

Guided Altitude Slider
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
commit
d689077863
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/FlightDisplay/GuidedAltitudeSlider.qml
  2. 2
      src/QmlControls/QGCSlider.qml

5
src/FlightDisplay/GuidedAltitudeSlider.qml

@ -26,6 +26,7 @@ Rectangle {
property bool _fixedWing: activeVehicle ? activeVehicle.fixedWing : false property bool _fixedWing: activeVehicle ? activeVehicle.fixedWing : false
property real _sliderMaxAlt: _flyViewSettings ? _flyViewSettings.guidedMaximumAltitude.rawValue : 0 property real _sliderMaxAlt: _flyViewSettings ? _flyViewSettings.guidedMaximumAltitude.rawValue : 0
property real _sliderMinAlt: _flyViewSettings ? _flyViewSettings.guidedMinimumAltitude.rawValue : 0 property real _sliderMinAlt: _flyViewSettings ? _flyViewSettings.guidedMinimumAltitude.rawValue : 0
property bool _flying: activeVehicle ? activeVehicle.flying : false
function reset() { function reset() {
altSlider.value = 0 altSlider.value = 0
@ -89,14 +90,14 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
orientation: Qt.Vertical orientation: Qt.Vertical
minimumValue: -1 minimumValue: _flying ? -1 : 0
maximumValue: 1 maximumValue: 1
zeroCentered: true zeroCentered: true
rotation: 180 rotation: 180
// We want slide up to be positive values // We want slide up to be positive values
transform: Rotation { transform: Rotation {
origin.x: altSlider.width / 2 origin.x: altSlider.width / 2
origin.y: altSlider.height / 2 origin.y: altSlider.height / 2
angle: 180 angle: 180
} }

2
src/QmlControls/QGCSlider.qml

@ -23,8 +23,6 @@ Slider {
property bool zeroCentered: false property bool zeroCentered: false
property bool displayValue: false property bool displayValue: false
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
style: SliderStyle { style: SliderStyle {
groove: Item { groove: Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

Loading…
Cancel
Save