Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r5dce80bb3079b3f0e6e134110e267be3277c3a8d -r229870eb947f48ebc4fed9390cd426daea5682e9 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 5dce80bb3079b3f0e6e134110e267be3277c3a8d) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 229870eb947f48ebc4fed9390cd426daea5682e9) @@ -32,9 +32,18 @@ property alias rangebar : _rangeRect + QtObject { id: _private + property int val : isOutLower ? min : isOutUpper ? max : value + property int min : minimum + property int max : maximum + property bool isOutLower : value < min + property bool isOutUpper : value > max + property bool isOutRange : isOutLower || isOutUpper + } + property int markerHeight: Variables.rangeMarkerHeightMidle - property color markerColor : markerOutRangeNotify ? (value >= lowerBound && value <= upperBound ? Colors.rangeMarker : Colors.red) : Colors.rangeMarker - property bool markerOutRangeNotify: false + property color markerColor : markerOutRangeNotify ? ( _private.isOutRange ? Colors.red : Colors.rangeMarker) : Colors.rangeMarker + property bool markerOutRangeNotify: true property bool markerVisible : true property int markerBoundHeight : Variables.rangeMarkerHeightShort @@ -83,7 +92,7 @@ visible: _root.markerVisible decimal: _root.decimal value : parent.value - x : ((parent.width * (parent.value - minimum)) / (maximum - minimum)) + x : ((parent.width * (_private.val - _private.min)) / (_private.max - _private.min)) text.visible: true text.font.pixelSize: _root.markerFontSize hasHandle : true Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r229870eb947f48ebc4fed9390cd426daea5682e9 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 229870eb947f48ebc4fed9390cd426daea5682e9) @@ -146,8 +146,6 @@ onUpperBoundChanged: { _pressureSlider.maxValue = upperBound } - - markerOutRangeNotify : true } RangeSlider { id: _pressureSlider anchors { Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -rfe8135c784a6c5ad2f35957d39af96f31d7c5618 -r229870eb947f48ebc4fed9390cd426daea5682e9 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision fe8135c784a6c5ad2f35957d39af96f31d7c5618) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 229870eb947f48ebc4fed9390cd426daea5682e9) @@ -72,7 +72,6 @@ // venousUpperBound : 0 // requested to hide the bounds isTouchable : false - valueOutRangeNotify : false x : Variables.screenGridLeftColumnX y : Variables.screenGridRow1Y width : Variables.screenGridAreaWidth Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -r9171bf54844dcec41ee5e6feb7ee4d87ef5ebbb4 -r229870eb947f48ebc4fed9390cd426daea5682e9 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 9171bf54844dcec41ee5e6feb7ee4d87ef5ebbb4) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 229870eb947f48ebc4fed9390cd426daea5682e9) @@ -63,7 +63,6 @@ // arterialUpperBound : 0 // requested to hide the bounds // venousLowerBound : 0 // requested to hide the bounds // venousUpperBound : 0 // requested to hide the bounds - // valueOutRangeNotify : false isTouchable : false x : Variables.screenGridLeftColumnX Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r229870eb947f48ebc4fed9390cd426daea5682e9 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 229870eb947f48ebc4fed9390cd426daea5682e9) @@ -74,7 +74,6 @@ // venousUpperBound : 0 // requested to hide the bounds isTouchable : false - valueOutRangeNotify : false x : Variables.screenGridLeftColumnX y : Variables.screenGridRow1Y width : Variables.screenGridAreaWidth