Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -rca5a17d5abaae0982922faca123d6f189135d413 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision ca5a17d5abaae0982922faca123d6f189135d413) @@ -36,9 +36,12 @@ property int val : isOutLower ? min : isOutUpper ? max : value property int min : minimum property int max : maximum - property bool isOutLower : value < min + property bool isOutLower : value < min // value out of min/max range property bool isOutUpper : value > max - property bool isOutRange : isOutLower || isOutUpper + + property bool isUnderBounds : value < lowerBound // value out of lower/ upper bounds + property bool isOverBounds : value > upperBound + property bool isOutRange : isOverBounds || isUnderBounds } property int markerHeight: Variables.rangeMarkerHeightMidle Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -rca5a17d5abaae0982922faca123d6f189135d413 --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision ca5a17d5abaae0982922faca123d6f189135d413) @@ -7,7 +7,7 @@ import "qrc:/globals" import "qrc:/components" -Row { id: _row +Row { id: _root property alias minimum : _rangeBar.minimum property alias maximum : _rangeBar.maximum property alias lowerBound : _rangeBar.lowerBound @@ -18,11 +18,8 @@ property int barHeight : 15 property int titleSize : 35 - property int valueSize : 70 + property int valueSize : 68 - property int prevMaximum : _rangeBar.maximum - property int prevMinimum : _rangeBar.minimum - property bool valueOutRangeNotify : true spacing : Variables.defaultMargin @@ -32,7 +29,7 @@ height : 50 color : Colors.pressuresText font { - pixelSize : _row.titleSize + pixelSize : _root.titleSize weight : Font.Medium } verticalAlignment : Text.AlignVCenter @@ -45,7 +42,7 @@ pressure color : Colors.pressuresText font { - pixelSize : _row.valueSize + pixelSize : _root.valueSize weight : Font.Bold } verticalAlignment : Text.AlignVCenter @@ -54,12 +51,12 @@ RangeBar { id: _rangeBar height : barHeight - width : _row.width * 0.60 + width : _root.width * 0.60 anchors.verticalCenter : parent.verticalCenter anchors.verticalCenterOffset: Variables.defaultMargin rangebar.color : barColor markerOutRangeNotify: _root.valueOutRangeNotify - color : valueOutRangeNotify ? Colors.backgroundRangeRect : + color : _root.valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color markerBoundColor : Colors.rangeMarker Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -re36852d9548379bd861d4b0838761d2aa5243dad -rca5a17d5abaae0982922faca123d6f189135d413 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e36852d9548379bd861d4b0838761d2aa5243dad) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ca5a17d5abaae0982922faca123d6f189135d413) @@ -44,8 +44,6 @@ property int venousPressure : vTreatmentPressureOcclusion.venousPressure property int tmpPressure : vTreatmentPressureOcclusion.tmpPressure - property bool valueOutRangeNotify : true - header.title : qsTr("Pressures") + " (" + qsTr("mmHg") + ")" contentArea.anchors.topMargin : Variables.defaultMargin @@ -59,7 +57,6 @@ leftPadding : Variables.defaultMargin rightPadding : Variables.defaultMargin - TreatmentPressureComponent { id: _arterialRangeBar title : qsTr("Arterial:") height : _column.cellHeight @@ -71,8 +68,6 @@ upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum pressure : _root.arterialPressure - - valueOutRangeNotify : _root.valueOutRangeNotify } TreatmentPressureComponent { id: _venousRangeBar @@ -86,8 +81,6 @@ upperBound : _root.venousUpperBound maximum : _root.venousMaximum pressure : _root.venousPressure - - valueOutRangeNotify : _root.valueOutRangeNotify } TreatmentPressureComponent { id: _tmpRangeBar @@ -101,8 +94,6 @@ upperBound : _root.tmpUpperBound maximum : _root.tmpMaximum pressure : _root.tmpPressure - - valueOutRangeNotify : _root.valueOutRangeNotify } } Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -re36852d9548379bd861d4b0838761d2aa5243dad -rca5a17d5abaae0982922faca123d6f189135d413 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision e36852d9548379bd861d4b0838761d2aa5243dad) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision ca5a17d5abaae0982922faca123d6f189135d413) @@ -113,7 +113,6 @@ FROMVARIANT_WITHRETURN ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Def" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Res" , Int , isConfigsOk );