Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -rca5a17d5abaae0982922faca123d6f189135d413 -rc2052b4fce3124e6d5132ccc78b3848b5f3e0dff --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision ca5a17d5abaae0982922faca123d6f189135d413) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision c2052b4fce3124e6d5132ccc78b3848b5f3e0dff) @@ -18,14 +18,14 @@ property int barHeight : 15 property int titleSize : 35 - property int valueSize : 68 + property int valueSize : 70 property bool valueOutRangeNotify : true spacing : Variables.defaultMargin Text { id: _title - width : 200 + width : 125 height : 50 color : Colors.pressuresText font { @@ -36,7 +36,7 @@ } Text { id: _value - width : 50 + width : 140 height : 50 text : pressure > 0 ? "+" + pressure : pressure Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rca5a17d5abaae0982922faca123d6f189135d413 -rc2052b4fce3124e6d5132ccc78b3848b5f3e0dff --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ca5a17d5abaae0982922faca123d6f189135d413) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision c2052b4fce3124e6d5132ccc78b3848b5f3e0dff) @@ -54,7 +54,7 @@ spacing : Variables.defaultMargin * 4 topPadding : Variables.defaultMargin - leftPadding : Variables.defaultMargin + leftPadding : Variables.defaultMargin / 2 rightPadding : Variables.defaultMargin TreatmentPressureComponent { id: _arterialRangeBar @@ -64,8 +64,8 @@ barColor : Colors.pressuresArterialBar minimum : _root.arterialMinimum - lowerBound : _root.arterialLowerBound - upperBound : _root.arterialUpperBound + lowerBound : checkLowerBound(_root.arterialLowerBound, minimum) + upperBound : checkUpperBound(_root.arterialUpperBound, maximum) maximum : _root.arterialMaximum pressure : _root.arterialPressure } @@ -77,8 +77,8 @@ barColor : Colors.pressuresVenousBar minimum : _root.venousMinimum - lowerBound : _root.venousLowerBound - upperBound : _root.venousUpperBound + lowerBound : checkLowerBound(_root.venousLowerBound, minimum) + upperBound : checkUpperBound(_root.venousUpperBound, maximum) maximum : _root.venousMaximum pressure : _root.venousPressure } @@ -90,8 +90,8 @@ barColor : Colors.pressuresTmpBar minimum : _root.tmpMinimum - lowerBound : _root.tmpLowerBound - upperBound : _root.tmpUpperBound + lowerBound : checkLowerBound(_root.tmpLowerBound, minimum) + upperBound : checkUpperBound(_root.tmpUpperBound, maximum) maximum : _root.tmpMaximum pressure : _root.tmpPressure } @@ -111,4 +111,7 @@ onClicked : print ("Expanding Arrows clicked") } + + function checkLowerBound (lowerBound, minimum) { return lowerBound < minimum ? minimum : lowerBound } + function checkUpperBound (upperBound, maximum) { return upperBound > maximum ? maximum : upperBound } } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rb5dd3abd72e322c286a1aa29a57ba5d1111c1954 -rc2052b4fce3124e6d5132ccc78b3848b5f3e0dff --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision b5dd3abd72e322c286a1aa29a57ba5d1111c1954) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c2052b4fce3124e6d5132ccc78b3848b5f3e0dff) @@ -61,6 +61,7 @@ bottomTextFont.weight : Font.Normal leftAlign : true unitText : Variables.unitVolume + showCenterText : true } LabelValue { id: _ufRate