Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r526fb054edbbeebdcce33ca630ae08ba04067fac --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) @@ -98,5 +98,6 @@ hasHandle : true height : markerHeight color : markerColor + valueOnTop : true } } Index: sources/gui/qml/components/RangeMarker.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r526fb054edbbeebdcce33ca630ae08ba04067fac --- sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) @@ -31,6 +31,7 @@ property color color : Colors.rangeMarker property alias thickness : _root.width property alias hasHandle : _handle.visible + property bool valueOnTop : false height: parent.height width : Variables.rangeMarkerWidth @@ -69,9 +70,10 @@ } anchors { right : parent.left - top : parent.top - rightMargin: 5 - topMargin : -5 + top : valueOnTop ? undefined : parent.top + bottom : valueOnTop ? _handle.top : undefined + rightMargin: valueOnTop ? -8 : 5 + topMargin : valueOnTop ? 0 : -5 } color : _root.color text : value.toFixed(decimal) Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 -r526fb054edbbeebdcce33ca630ae08ba04067fac --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) @@ -84,9 +84,9 @@ readonly property color line : "#094266" readonly property color pressuresText : white - readonly property color pressuresArterialBar : "#c568ed" + readonly property color pressuresArterialBar : "#FF8282" readonly property color pressuresVenousBar : "#31bcdb" - readonly property color pressuresTmpBar : "#31bcdb" + readonly property color pressuresTmpBar : "#818181" readonly property color pressuresOutOfRangeBg : red readonly property color pressureBorderActive : "#cccccc" // this is the active border around the red Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r526fb054edbbeebdcce33ca630ae08ba04067fac --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) @@ -78,7 +78,7 @@ readonly property int rangeRectBorderWidth : 2 readonly property int rangeMarkerHeight : 60 readonly property int rangeMarkerHeightMidle : 40 - readonly property int rangeMarkerHeightShort : 20 + readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 readonly property int progressbarHeight : 30 Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 -r526fb054edbbeebdcce33ca630ae08ba04067fac --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) @@ -17,7 +17,7 @@ property color barColor : Colors.backgroundRangeRect property bool valueOutRangeNotify : true - property int barHeight : 25 + property int barHeight : 20 property int titleSize : 35 property int valueSize : 60 @@ -49,8 +49,10 @@ RangeBar { id: _rangeBar height : barHeight width : _row.width * 0.60 + anchors.verticalCenter: parent.verticalCenter rangebar.color : barColor markerOutRangeNotify: _root.valueOutRangeNotify color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + markerBoundColor : Colors.rangeMarker } }