Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -raac9d5d70abbd8d75c6e3782722e5daaf7355153 -r74fa9686a916c53d1549fa3733d200edb9df9d3b --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 74fa9686a916c53d1549fa3733d200edb9df9d3b) @@ -52,7 +52,7 @@ step : minimum space/movement between each range slider values \endverbatim */ -Row { id: _root +Item { id: _root property real minimum : 0 ///< the minimum value of the range (adjustable slider might be different regarding the minimumMargin) property real minimumMargin : 0 ///< the margin of the adjustable minimum value from the minimm property real lowerBoundMin : 0 ///< the adjutable lowerband minimum acceptable value @@ -72,27 +72,36 @@ property string titleText : "" ///< the component title property string titleUnit : Variables.unitTextBloodPressure ///< the component unit property int titleFontSize : Fonts.fontPixelPresseuresLabel ///< the component title font size - property int titleWidth : 200 ///< the component title width + property int titleWidth : 150 ///< the component title width property int progressWidth : Variables.pressuresProgressbarWidth ///< rangebar width property color progressColor : Colors.highlightProgressBar ///< rangebar color property int sliderTopMargin : 100 ///< top margin between the slider and the rangebar - spacing: 25 + width : parent.width + height : 200 TextRect { id: _pressureTextRect anchors.top: parent.top + height:50 width: titleWidth - label: _root.titleText + title: _root.titleText extra: _root.titleUnit + labelFont.weight: Font.ExtraLight labelFont.pixelSize: _root.titleFontSize + extraLabelPixelSize: 20 + anchors.left: parent.left + anchors.leftMargin: 30 } Rectangle { id: _pressureRect + anchors.top: parent.top + anchors.topMargin: _pressureTextRect.height + anchors.left: parent.left + anchors.leftMargin: _maxHandleArrows.width + _pressureSlider.maxText.width width : _root.progressWidth - height: 10 - color: Colors.transparent + color : Colors.transparent property int minMargin: _root.minimumMargin property int maxMargin: _root.maximumMargin @@ -202,5 +211,21 @@ upperBound = maxValue } } + + SliderArrows{ id:_maxHandleArrows + anchors.verticalCenter : _pressureSlider.verticalCenter + anchors.left : _pressureRangeBar.right + anchors.leftMargin : Variables.sliderAdjustButtonLeftMargin + _pressureSlider.maxText.width + onIncrementValue : _pressureSlider.incrementMax(true) + onDecrementValue : _pressureSlider.decrementMax(true) + } + + SliderArrows{ id:_minHandleArrows + anchors.verticalCenter : _pressureSlider.verticalCenter + anchors.right : _pressureRangeBar.left + anchors.rightMargin : 10 + onIncrementValue : _pressureSlider.incrementMin(true) + onDecrementValue : _pressureSlider.decrementMin(true) + } } }