Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 -re4a6f98d9a3eefb5226f85d62dfe103867189a4c --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c) @@ -80,22 +80,17 @@ Line { x: 0; y: row2LineY; length: lineLength } TreatmentPressures { id: _pressuresTouchArea arterialMinimum : Variables.arterialValueMin - arterialLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow - arterialUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh arterialMaximum : Variables.arterialValueMax - venousMinimum : Variables.venousValueMin - venousLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow - venousUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh venousMaximum : Variables.venousValueMax arterilPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure x : leftColumnX y : row3Y - width : areaWidth - height : areaHeightRow3 + width : areaWidth + height : areaHeightRow3 onClicked: { sectionPressuresClicked() @@ -156,4 +151,26 @@ } } } + + Connections { target: _pressuresTouchArea + Component.onCompleted: { // initial update of the pressure section + _pressuresTouchArea.setBounds( + vTreatmentAdjustmentPressuresLimits.arterialLimitLow , + vTreatmentAdjustmentPressuresLimits.arterialLimitHigh , + vTreatmentAdjustmentPressuresLimits.venousLimitLow , + vTreatmentAdjustmentPressuresLimits.venousLimitHigh ) + } + } + + Connections { target: vTreatmentAdjustmentPressuresLimits + onAdjustmentTriggered : { // updates the pressure section if only it has been accepted + if(vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { + _pressuresTouchArea.setBounds( + vTreatmentAdjustmentPressuresLimits.arterialLimitLow , + vTreatmentAdjustmentPressuresLimits.arterialLimitHigh , + vTreatmentAdjustmentPressuresLimits.venousLimitLow , + vTreatmentAdjustmentPressuresLimits.venousLimitHigh ) + } + } + } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -re4a6f98d9a3eefb5226f85d62dfe103867189a4c --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c) @@ -47,6 +47,20 @@ isTouchable: true title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + /* + Since this Component cannot be bound to the properties since it has to make sure the request has been accepted. + Because the pressure response regardless of the accepted/rejected the FW Software message will pass what is preferred. + */ + function setBounds(vArterialLimitLow , + vArterialLimitHigh , + vVenousLimitLow , + vVenousLimitHigh ) { + _root.arterialLowerBound = vArterialLimitLow + _root.arterialUpperBound = vArterialLimitHigh + _root.venousLowerBound = vVenousLimitLow + _root.venousUpperBound = vVenousLimitHigh + } + RangeBar { id: _arterialRangeBar x: 0 y: 80