Index: leahi.qrc =================================================================== diff -u -r5001ec3cb4b5e76db9fa3c70a36e9c8d64677348 -r86aaf030d6eb405f301f703aa68e6854db7eb5d1 --- leahi.qrc (.../leahi.qrc) (revision 5001ec3cb4b5e76db9fa3c70a36e9c8d64677348) +++ leahi.qrc (.../leahi.qrc) (revision 86aaf030d6eb405f301f703aa68e6854db7eb5d1) @@ -156,7 +156,7 @@ sources/gui/qml/components/LabelValue.qml sources/gui/qml/components/ArrowButton.qml sources/gui/qml/components/HeaderBar.qml - sources/gui/qml/components/SliderUfAdjustment.qml + sources/gui/qml/components/StoppedSlider.qml sources/gui/qml/compounds/PressureRangeSlider.qml Fisheye: Tag 86aaf030d6eb405f301f703aa68e6854db7eb5d1 refers to a dead (removed) revision in file `sources/gui/qml/components/SliderUfAdjustment.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/StoppedSlider.qml =================================================================== diff -u -r0785a7f6a49fb8b520b280390bb26ec73606d653 -r86aaf030d6eb405f301f703aa68e6854db7eb5d1 --- sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 0785a7f6a49fb8b520b280390bb26ec73606d653) +++ sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 86aaf030d6eb405f301f703aa68e6854db7eb5d1) @@ -38,6 +38,9 @@ signal pressed () signal released() + height : Variables.createTreatmentSliderHeight + width : Variables.createTreatmentSliderWidth + function reset(vValue) { _slider.reset(vValue) } @@ -74,15 +77,13 @@ pixelSize : Fonts.fontPixelButton weight : Font.Normal } - color : Colors.progressBarMinMax text : _root.minimum.toFixed(_root.decimal) + (_root.unit.length ? (" " + _root.unit) : "") } maxText { font { pixelSize : minText.font.pixelSize weight : minText.font.weight } - color : Colors.progressBarMinMax text : _root.maximum.toFixed(_root.decimal) + (_root.unit.length ? (" " + _root.unit) : "") } @@ -91,11 +92,11 @@ top : parent.top bottom : parent.bottom left : parent.left - right : _lowMarker.right + right : _removedMarker.right // adjust margin so fill completely covers the underlying slider leftMargin : -1 } - z : _lowMarker.z - 1 + z : _removedMarker.z - 1 color : Colors.ufProgressBarFill radius : height / 2 @@ -105,23 +106,23 @@ bottom : parent.bottom right : parent.right } - width : Math.min(parent.radius, _lowMarker.x) + width : Math.min(parent.radius, _removedMarker.x) color : parent.color } } - RangeMarker { id: _lowMarker - x : (_slider.width * ((value - _slider.minimum) / (_slider.maximum - _slider.minimum))) - ((width+1)/2) + RangeMarker { id: _removedMarker + x : (_slider.width * (_slider.minStop / _slider.maximum)) - ((width+1)/2) z : _slider.handler.z - 1 width : Variables.ultrafiltrationRangeMarkerWidth height : Variables.rangeMarkerHeight hasHandle : true valueOnTop : true decimal : Variables.ultrafiltrationPrecision - value : Math.max(_root.minStop, _root.minimum) + value : _root.minStop handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth text { - anchors.bottomMargin: _lowMarker.valueOnTop ? 15 : 0 + anchors.bottomMargin: _removedMarker.valueOnTop ? 15 : 0 font { pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker weight: Font.DemiBold Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r4c45b0a8be6589f9fb55b646edbe075a1f7df4fd -r86aaf030d6eb405f301f703aa68e6854db7eb5d1 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 4c45b0a8be6589f9fb55b646edbe075a1f7df4fd) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 86aaf030d6eb405f301f703aa68e6854db7eb5d1) @@ -67,7 +67,7 @@ volumeRemoved : _private.volumeRemoved } - SliderUfAdjustment { id: _setVolumeSlider + StoppedSlider { id: _setVolumeSlider anchors { top : _ufMetrics.bottom topMargin : Variables.ultrafiltrationContentMargin