Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -re8df7fe7fe6274c416f176369250b9581e07d2a5 -rc953b3fb94b4fe7347c0ca48d85ca99ddc7e9027 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c953b3fb94b4fe7347c0ca48d85ca99ddc7e9027) @@ -70,10 +70,14 @@ } Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin - arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax - venousMinimum : vTreatmentRanges.venousPressureMonitorMin - venousMaximum : vTreatmentRanges.venousPressureMonitorMax + arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow || vTreatmentRanges.arterialPressureLimitLowMin + arterialUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh || vTreatmentRanges.arterialPressureLimitHighMax + arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousMinimum : vTreatmentRanges. venousPressureMonitorMin + venousLowerBound : vTreatmentAdjustmentPressuresLimits. venousLimitLow || vTreatmentRanges. venousPressureLimitLowMin + venousUpperBound : vTreatmentAdjustmentPressuresLimits. venousLimitHigh || vTreatmentRanges. venousPressureLimitHighMax + venousMaximum : vTreatmentRanges. venousPressureMonitorMax arterialPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure @@ -130,26 +134,4 @@ _treatmentMenu.hidden = false } } - - 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 -re8df7fe7fe6274c416f176369250b9581e07d2a5 -rc953b3fb94b4fe7347c0ca48d85ca99ddc7e9027 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision c953b3fb94b4fe7347c0ca48d85ca99ddc7e9027) @@ -49,20 +49,6 @@ 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 Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -re8df7fe7fe6274c416f176369250b9581e07d2a5 -rc953b3fb94b4fe7347c0ca48d85ca99ddc7e9027 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision c953b3fb94b4fe7347c0ca48d85ca99ddc7e9027) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 23-Oct-2022 + * \date (last) 04-Nov-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *