Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -re4a6f98d9a3eefb5226f85d62dfe103867189a4c --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c) @@ -52,6 +52,8 @@ signal backClicked() signal sectionFlowClicked() + signal sectionVitalsClicked() + signal sectionPressuresClicked() signal sectionTimeClicked() signal sectionUltrafiltrationClicked() @@ -71,24 +73,28 @@ y : row2Y width : areaWidth height : areaHeightRow2 + onClicked: { + sectionVitalsClicked() + } } Line { x: 0; y: row2LineY; length: lineLength } - TreatmentPressure { id: _pressureTouchArea - // TEST : these values are test values. - arterialMinimum : -400 - arterialLowerBound : -300 - arterialUpperBound : 100 - arterialMaximum : 400 + TreatmentPressures { id: _pressuresTouchArea + arterialMinimum : Variables.arterialValueMin + arterialMaximum : Variables.arterialValueMax + venousMinimum : Variables.venousValueMin + venousMaximum : Variables.venousValueMax - venousMinimum : -100 - venousLowerBound : -100 - venousUpperBound : 500 - venousMaximum : 800 + arterilPressure : vTreatmentPressureOcclusion.arterialPressure + venousPressure : vTreatmentPressureOcclusion.venousPressure x : leftColumnX y : row3Y - width : areaWidth - height : areaHeightRow3 + width : areaWidth + height : areaHeightRow3 + + onClicked: { + sectionPressuresClicked() + } } // ---------- COLUMN RIGHT @@ -145,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 ) + } + } + } }