Index: denali.pro.user =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- denali.pro.user (.../denali.pro.user) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ denali.pro.user (.../denali.pro.user) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1214,7 +1214,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -q + -q -m 3768 false true Index: en_US.udic =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- en_US.udic (.../en_US.udic) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ en_US.udic (.../en_US.udic) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -12,3 +12,4 @@ Dest HD Rsp +PRS Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -104,10 +104,12 @@ // Min/Max readonly property int bloodFlowMin : 100 readonly property int bloodFlowMax : 500 + // Resolutions readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + // Units // - Ultrafiltration readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -135,19 +135,25 @@ } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - onCloseClicked : close() - //onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) - // TODO : TEST : values are real regarding PRS but has to be populated my Model. - arterialPressureMinimum : -400 - arterialPressureLowerBound : -300 - arterialPressureUpperBound : +100 - arterialPressureMaximum : +600 - arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure + onCloseClicked : close() + onConfirmClicked : vTreatmentAdjustmentPressuresLimits.doAdjustment( + arterialPressureLowerBound , + arterialPressureUpperBound , + venousPressureLowerBound , + venousPressureUpperBound + ) - venousPressureMinimum : -100 - venousPressureLowerBound : +100 - venousPressureUpperBound : +400 - venousPressureMaximum : +700 + arterialPressureMinimum : vTreatmentAdjustmentPressuresLimits.arterialLimitMin + arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow + arterialPressureUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh + arterialPressureMaximum : vTreatmentAdjustmentPressuresLimits.arterialLimitMax + + venousPressureMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin + venousPressureLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow + venousPressureUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh + venousPressureMaximum : vTreatmentAdjustmentPressuresLimits.venousLimitMax + + arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure venousPressureValue : vTreatmentPressureOcclusion.venousPressure } @@ -270,6 +276,14 @@ } } + Connections { target: vTreatmentAdjustmentPressuresLimits + onAdjustmentTriggered : { + if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { + _treatmentAdjustmentPressuresLimits.close() + } + } + } + Connections { target: vCreateTreatment onShowConfirm : { push(_treatmentConfirm) } onShowPrime : { push(_treatmentPrime ) } Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -79,17 +79,19 @@ } Line { x: 0; y: row2LineY; length: lineLength } TreatmentPressures { id: _pressuresTouchArea - // TEST : these values are test values. - arterialMinimum : -400 - arterialLowerBound : -300 - arterialUpperBound : 100 - arterialMaximum : 400 + arterialMinimum : vTreatmentAdjustmentPressuresLimits.arterialLimitMin + arterialLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow + arterialUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh + arterialMaximum : vTreatmentAdjustmentPressuresLimits.arterialLimitMax - venousMinimum : -100 - venousLowerBound : -100 - venousUpperBound : 500 - venousMaximum : 800 + venousMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin + venousLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow + venousUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh + venousMaximum : vTreatmentAdjustmentPressuresLimits.venousLimitMax + arterilPressure : vTreatmentPressureOcclusion.arterialPressure + venousPressure : vTreatmentPressureOcclusion.venousPressure + x : leftColumnX y : row3Y width : areaWidth Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -90,14 +90,8 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresArterialBar - minimum : arterialPressureMinimum minimumMargin : 0 - lowerBound : arterialPressureLowerBound - upperBound : arterialPressureUpperBound maximumMargin : 25 - maximum : arterialPressureMaximum - value : arterialPressureValue - step : arterialPressureStep } Line { @@ -111,14 +105,8 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresVenousBar - minimum : venousPressureMinimum minimumMargin : 50 - lowerBound : venousPressureLowerBound - upperBound : venousPressureUpperBound maximumMargin : 75 - maximum : venousPressureMaximum - value : venousPressureValue - step : venousPressureStep } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -30,14 +30,15 @@ property int arterialLowerBound : 0 property int arterialUpperBound : 0 property int arterialMaximum : 0 - property alias arterilPressure : _arterialRangeBar.value property int venousMinimum : 0 property int venousLowerBound : 0 property int venousUpperBound : 0 property int venousMaximum : 0 - property alias venusPressure : _venousRangeBar.value + property int arterilPressure : 0 + property int venousPressure : 0 + clip: false x : 0 y : 0 @@ -54,12 +55,11 @@ rangebar.color: Colors.pressuresArterialBar markerOutRangeNotify: true - value : vTreatmentPressureOcclusion.arterialPressure - minimum : _root.arterialMinimum lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum + value : _root.arterilPressure Text { id: _arterialText anchors { @@ -82,12 +82,11 @@ rangebar.color: Colors.pressuresVenousBar markerOutRangeNotify: true - value : vTreatmentPressureOcclusion.venousPressure - minimum : _root.venousMinimum lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound maximum : _root.venousMaximum + value : _root.venousPressure Text { id: _venousText anchors { Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rc1474e48907082e10a2eb03adf40f0acd4af9a63 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -288,20 +288,42 @@ * */ class MAdjustPressuresLimitsReq : public MModel { + + static const qint32 _arterialLimitMin = -300; // constant by PRS354 + static const qint32 _arterialLimitLow = -300; // default by PRS354 + static const qint32 _arterialLimitHigh = +100; // default by PRS355 + static const qint32 _arterialLimitMax = +200; // constant by PRS354 + + static const qint32 _venousLimitMin = -100; // constant by PRS356 + static const qint32 _venousLimitLow = -100; // default by PRS356 + static const qint32 _venousLimitHigh = +400; // default by PRS357 + static const qint32 _venousLimitMax = +600; // constant by PRS356 + public: - qint32 mArterialLimitLow = 0; ///< (S32) Arterial Pressure Limit Low (mmHg) - qint32 mArterialLimitHigh = 0; ///< (S32) Arterial Pressure Limit High (mmHg) - qint32 mVenousLimitLow = 0; ///< (S32) Venous Pressure Limit Low (mmHg) - qint32 mVenousLimitHigh = 0; ///< (S32) Venous Pressure Limit High (mmHg) + qint32 mArterialLimitMin = _arterialLimitMin ; ///< (S32) Arterial Pressure Limit Min (mmHg) + qint32 mArterialLimitLow = _arterialLimitLow ; ///< (S32) Arterial Pressure Limit Low (mmHg) + qint32 mArterialLimitHigh = _arterialLimitHigh; ///< (S32) Arterial Pressure Limit High (mmHg) + qint32 mArterialLimitMax = _arterialLimitMax ; ///< (S32) Arterial Pressure Limit Max (mmHg) + qint32 mVenousLimitMin = _venousLimitMin ; ///< (S32) Venous Pressure Limit Min (mmHg) + qint32 mVenousLimitLow = _venousLimitLow ; ///< (S32) Venous Pressure Limit Low (mmHg) + qint32 mVenousLimitHigh = _venousLimitHigh ; ///< (S32) Venous Pressure Limit High (mmHg) + qint32 mVenousLimitMax = _venousLimitMax ; ///< (S32) Venous Pressure Limit Max (mmHg) + // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString - ({ mArterialLimitLow , - mArterialLimitHigh, - mVenousLimitLow , - mVenousLimitHigh }); + ({ mArterialLimitMin , + mArterialLimitLow , + mArterialLimitHigh , + mArterialLimitMax , + + mVenousLimitMin , + mVenousLimitLow , + mVenousLimitHigh , + mVenousLimitMax + }); } // coco end static QString toString(const QVariantList &vParameters) { Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -47,11 +47,17 @@ // coco end // Treatment pressures limits data - PROPERTY( qint32 , arterialLimitLow , 0) - PROPERTY( qint32 , arterialLimitHigh , 0) - PROPERTY( qint32 , venousLimitLow , 0) - PROPERTY( qint32 , venousLimitHigh , 0) + PROPERTY( qint32 , arterialLimitMin , _data.mArterialLimitMin ) // constant by PRS354 + PROPERTY( qint32 , arterialLimitLow , _data.mArterialLimitLow ) // default by PRS354 + PROPERTY( qint32 , arterialLimitHigh , _data.mArterialLimitHigh ) // default by PRS355 + PROPERTY( qint32 , arterialLimitMax , _data.mArterialLimitMax ) // constant by PRS354 + PROPERTY( qint32 , venousLimitMin , _data.mVenousLimitMin ) // constant by PRS356 + PROPERTY( qint32 , venousLimitLow , _data.mVenousLimitLow ) // default by PRS356 + PROPERTY( qint32 , venousLimitHigh , _data.mVenousLimitHigh ) // default by PRS357 + PROPERTY( qint32 , venousLimitMax , _data.mVenousLimitMax ) // constant by PRS356 + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) // ----- Adjust Pressures Limits @@ -64,7 +70,10 @@ * \param vVenousLimitLow * \param vVenousLimitHigh */ - void doAdjustment( qint32 vArterialLimitLow, qint32 vArterialLimitHigh, qint32 vVenousLimitLow, qint32 vVenousLimitHigh ) { + void doAdjustment( qint32 vArterialLimitLow , + qint32 vArterialLimitHigh, + qint32 vVenousLimitLow , + qint32 vVenousLimitHigh ) { _data.mArterialLimitLow = vArterialLimitLow ; _data.mArterialLimitHigh = vArterialLimitHigh; _data.mVenousLimitLow = vVenousLimitLow ; Index: sources/view/hd/data/VTreatmentPressureOcclusion.h =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 --- sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) @@ -44,6 +44,7 @@ PROPERTY( quint32 , dialysateInletPumpOcclusion , 0) PROPERTY( quint32 , dialysateOutletPumpOcclusion , 0) // coco end + VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) }; }