From 3af867356fc02398e320b7e1760526f46fa51603 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 11 Mar 2016 14:43:02 -0800 Subject: [PATCH] Rework tuning UI --- src/QmlControls/FactSliderPanel.qml | 43 +++++++++++++++-------------- src/comm/PX4MockLink.params | 1 + 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/QmlControls/FactSliderPanel.qml b/src/QmlControls/FactSliderPanel.qml index b1d132122..6b6bfe1cc 100644 --- a/src/QmlControls/FactSliderPanel.qml +++ b/src/QmlControls/FactSliderPanel.qml @@ -80,30 +80,31 @@ QGCView { font.weight: Font.DemiBold } - Rectangle { - id: sliderRect - anchors.topMargin: _margins / 2 + + Column { + anchors.margins: _margins anchors.left: parent.left anchors.right: parent.right anchors.top: panelLabel.bottom - height: sliderColumns.y + sliderColumns.height + _margins - color: palette.windowShade + spacing: _margins - Column { - id: sliderColumns - anchors.margins: _margins - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - spacing: _margins + Repeater { + id: sliderRepeater + model: sliderModel - Repeater { - id: sliderRepeater - model: sliderModel + Rectangle { + id: sliderRect + anchors.left: parent.left + anchors.right: parent.right + height: sliderColumn.y + sliderColumn.height + _margins + color: palette.windowShade Column { - anchors.left: parent.left - anchors.right: parent.right + id: sliderColumn + anchors.margins: _margins + anchors.left: parent.left + anchors.right: parent.right + anchors.top: sliderRect.top property alias sliderValue: slider.value @@ -132,11 +133,11 @@ QGCView { fact.value = value } } - } + } // Slider } // Column - } // Repeater - } // Column - } // Rectangle + } // Rectangle + } // Repeater + } // Column } // QGCFlickable } // QGCViewPanel } // QGCView diff --git a/src/comm/PX4MockLink.params b/src/comm/PX4MockLink.params index 124acd0b8..81dbb4486 100644 --- a/src/comm/PX4MockLink.params +++ b/src/comm/PX4MockLink.params @@ -282,6 +282,7 @@ 1 50 MPC_MANTHR_MIN 0.080 9 1 50 MPC_THR_MAX 1 9 1 50 MPC_THR_MIN 0.1 9 +1 50 MPC_THR_HOVER 0.5 9 1 50 MPC_TILTMAX_AIR 45 9 1 50 MPC_TILTMAX_LND 15 9 1 50 MPC_XY_FF 0.5 9 -- 2.22.0