Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -122,9 +122,7 @@ operatingValues : vTreatmentCreate.doGetOperatingParameterValues() onVisibleChanged: { if (visible) { - // prescriptionKeys = vTreatmentCreate.doGetPrescriptionParameterNames() prescriptionValues = vTreatmentCreate.doGetPrescriptionParameterValues() - // operatingKeys = vTreatmentCreate.doGetOperatingParameterNames() operatingValues = vTreatmentCreate.doGetOperatingParameterValues() } } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -188,35 +188,6 @@ // Heparin readonly property int heparinPrecision : 1 - // Inline Blood Pressures - // - Artrial - // - Artrial - Entire pressure value range - readonly property int arterialValueMin : -400; ///< PRS362 const - readonly property int arterialValueMax : +100; ///< PRS362 const - // - Artrial - Adjust pressure limit range and manufacturing default - Low - readonly property int arterialLimitLowMin : -300; ///< PRS354 const - readonly property int arterialLimitLowMax : +70; ///< PRS354 const - // - Artrial - Adjust pressure limit range and manufacturing default - High - readonly property int arterialLimitHighMin : -270; ///< PRS355 const - readonly property int arterialLimitHighMax : +100; ///< PRS355 const - // - Artrial - Adjust pressure limit resolution - readonly property int arterialLimitStep : +10; ///< PRS354,PRS355 // has to be the same since it's on the same line scale - readonly property int arterialLimitGap : +30; - - // - Venous - // - Venous - Entire pressure value range - readonly property int venousValueMin : -100; ///< PRS361 const - readonly property int venousValueMax : +700; ///< PRS361 const - // - Venous - Adjust pressure limit range and manufacturing default - Low - readonly property int venousLimitLowMin : +20; ///< PRS356 const - readonly property int venousLimitLowMax : +570; ///< PRS356 const - // - Venous - Adjust pressure limit range and manufacturing default - High - readonly property int venousLimitHighMin : +50; ///< PRS357 const - readonly property int venousLimitHighMax : +600; ///< PRS357 const - // - Venous - Adjust pressure limit resolution - readonly property int venousLimitStep : +10; ///< PRS356,PRS357 // has to be the same since it's on the same line scale - readonly property int venousLimitGap : +30; - function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -55,12 +55,12 @@ } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : Variables.arterialValueMin - arterialMaximum : Variables.arterialValueMax - venousMinimum : Variables.venousValueMin - venousMaximum : Variables.venousValueMax + arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousMinimum : vTreatmentRanges.venousPressureMonitorMin + venousMaximum : vTreatmentRanges.venousPressureMonitorMax - arterilPressure : vTreatmentPressureOcclusion.arterialPressure + arterialPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure isTouchable : false Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -98,7 +98,6 @@ maximum : vTreatmentRanges.bloodFlowRateMax step : vTreatmentRanges.bloodFlowRateRes value : vTreatmentRanges.bloodFlowRateDef - onPressed : vTreatmentCreate.bloodFlowRate = value onReleased : vTreatmentCreate.bloodFlowRate = value } @@ -183,7 +182,6 @@ maximum : vTreatmentRanges.heparinDispensingRateMax step : vTreatmentRanges.heparinDispensingRateRes value : vTreatmentRanges.heparinDispensingRateDef - onPressed : vTreatmentCreate.heparinDispensingRate = value onReleased : vTreatmentCreate.heparinDispensingRate = value adjustable : _heparinDispensingRateSwitch.checked @@ -252,7 +250,6 @@ maximum : vTreatmentRanges.heparinBolusVolumeMax step : vTreatmentRanges.heparinBolusVolumeRes value : vTreatmentRanges.heparinBolusVolumeDef - onPressed : vTreatmentCreate.heparinBolusVolume = value onReleased : vTreatmentCreate.heparinBolusVolume = value adjustable : _heparinBolusVolumeSwitch.checked @@ -383,7 +380,7 @@ minimum : vTreatmentRanges.dialysateTempMin maximum : vTreatmentRanges.dialysateTempMax step : vTreatmentRanges.dialysateTempRes - value : 36 // vTreatmentRanges.dialysateTempDef + value : vTreatmentRanges.dialysateTempDef onPressed : vTreatmentCreate.dialysateTemp = value onReleased : vTreatmentCreate.dialysateTemp = value } @@ -453,12 +450,12 @@ maxVerticalEdgeVisible : false // Ranges - step : Variables.arterialLimitStep - gapValue : Variables.arterialLimitGap + step : vTreatmentRanges.arterialPressureLimitLowRes // currently min & max are on the same slider/scale so used min as the main res + gapValue : vTreatmentRanges.arterialPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res minimum : vTreatmentRanges.arterialPressureLimitLowMin maximum : vTreatmentRanges.arterialPressureLimitHighMax - minValue : vTreatmentRanges.arterialPressureLimitLowMin - maxValue : vTreatmentRanges.arterialPressureLimitHighMax + minValue : vTreatmentRanges.arterialPressureLimitLowDef + maxValue : vTreatmentRanges.arterialPressureLimitHighDef minValueLowerBound : vTreatmentRanges.arterialPressureLimitLowMin minValueUpperBound : vTreatmentRanges.arterialPressureLimitLowMax maxValueLowerBound : vTreatmentRanges.arterialPressureLimitHighMin @@ -539,12 +536,12 @@ maxVerticalEdgeVisible : false // Ranges - step : Variables.arterialLimitStep - gapValue : Variables.arterialLimitGap + step : vTreatmentRanges.venousPressureLimitLowRes // currently min & max are on the same slider/scale so used min as the main res + gapValue : vTreatmentRanges.venousPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res minimum : vTreatmentRanges.venousPressureLimitLowMin maximum : vTreatmentRanges.venousPressureLimitHighMax - minValue : vTreatmentRanges.venousPressureLimitLowMin - maxValue : vTreatmentRanges.venousPressureLimitHighMax + minValue : vTreatmentRanges.venousPressureLimitLowDef + maxValue : vTreatmentRanges.venousPressureLimitHighDef minValueLowerBound : vTreatmentRanges.venousPressureLimitLowMin minValueUpperBound : vTreatmentRanges.venousPressureLimitLowMax maxValueLowerBound : vTreatmentRanges.venousPressureLimitHighMin Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r7823da721f8041d6d39c37cd040e162ea9d35e7f -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 7823da721f8041d6d39c37cd040e162ea9d35e7f) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -41,7 +41,7 @@ //////////////////////////////////////////////////////////////////////////////// // FIXME: The model being used here is the QML FileListModel. // - // This model is so limited and not updated well. // + // This model is so limited and do not update well. // // This model definitely has to be replaced with a C++ one, // // like the other MVC classes we have. // //////////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ readonly property string typeLabelService : qsTr("Service" ) readonly property string typeLabelTreatment : qsTr("Treatment" ) - property bool isDevice : true //false // + property bool isDevice : false //true // readonly property string typePathClr : "" readonly property string typePathSrc : isDevice ? "file:///media/sd-card" : "file:///home/denali/Desktop/sd-card" readonly property string typePathDst : isDevice ? "file:///media/usb" : "file:///home/denali/Desktop/usb-disk" Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -57,12 +57,12 @@ } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : Variables.arterialValueMin - arterialMaximum : Variables.arterialValueMax - venousMinimum : Variables.venousValueMin - venousMaximum : Variables.venousValueMax + arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousMinimum : vTreatmentRanges.venousPressureMonitorMin + venousMaximum : vTreatmentRanges.venousPressureMonitorMax - arterilPressure : vTreatmentPressureOcclusion.arterialPressure + arterialPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure isTouchable : false Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -70,12 +70,12 @@ } Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : Variables.arterialValueMin - arterialMaximum : Variables.arterialValueMax - venousMinimum : Variables.venousValueMin - venousMaximum : Variables.venousValueMax + arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousMinimum : vTreatmentRanges.venousPressureMonitorMin + venousMaximum : vTreatmentRanges.venousPressureMonitorMax - arterilPressure : vTreatmentPressureOcclusion.arterialPressure + arterialPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure x : Variables.screenGridLeftColumnX Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -32,7 +32,14 @@ StackItem { id : _root objectName: "TreatmentStack" - onVisibleChanged: console.debug(" ~~~~~~~~~~ ", objectName) + onVisibleChanged : { // this should never happen by design, but in tests it can easily happen and will block the screen touch. + _treatmentAdjustmentFlow .close() + _vitalEntry .close() + _treatmentAdjustmentPressuresLimits .close() + _treatmentAdjustmentDuration .close() + _treatmentUltrafiltrationItem .close() + } + stackView.initialItem : null // ultrafiltration state information bar properties @@ -178,20 +185,20 @@ venousPressureUpperBound ) - arterialPressureMinimum : Variables.arterialValueMin + arterialPressureMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialPressureMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousPressureMinimum : vTreatmentRanges.venousPressureMonitorMin + venousPressureMaximum : vTreatmentRanges.venousPressureMonitorMax + arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow arterialPressureUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - arterialPressureMaximum : Variables.arterialValueMax - - venousPressureMinimum : Variables.venousValueMin venousPressureLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow venousPressureUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh - venousPressureMaximum : Variables.venousValueMax - arterialPressureStep : Variables.arterialLimitStep + arterialPressureStep : vTreatmentRanges.arterialPressureLimitLowRes arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure - venousPressureStep : Variables.venousLimitStep + venousPressureStep : vTreatmentRanges.venousPressureLimitLowRes venousPressureValue : vTreatmentPressureOcclusion.venousPressure } Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -35,6 +35,13 @@ } } + function close() { // this close should be never needed by design, but in tests it can easily happen and will block the screen touch. + _treatmentAdjustmentUltrafiltrationStart .close() + _treatmentAdjustmentUltrafiltrationPaused .close() + _treatmentAdjustmentUltrafiltrationEdit .close() + _treatmentAdjustmentUltrafiltrationConfirm .close() + } + TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart onCloseClicked : close() onPauseClicked : { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -35,14 +35,14 @@ property alias arterialPressureUpperBound : _arterialPressure.upperBound property alias arterialPressureMaximum : _arterialPressure.maximum property alias arterialPressureValue : _arterialPressure.value - property real arterialPressureStep : Variables.arterialLimitStep + property real arterialPressureStep : vTreatmentRanges.arterialPressureLimitRes property alias venousPressureMinimum : _venousPressure.minimum property alias venousPressureLowerBound : _venousPressure.lowerBound property alias venousPressureUpperBound : _venousPressure.upperBound property alias venousPressureMaximum : _venousPressure.maximum property alias venousPressureValue : _venousPressure.value - property real venousPressureStep : Variables.venousLimitStep + property real venousPressureStep : vTreatmentRanges.venousPressureLimitRes readonly property int textWidth : 200 @@ -56,13 +56,13 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresArterialBar - minimumMargin : Math.abs(Variables.arterialValueMin - Variables.arterialLimitLowMin ) - lowerBoundMin : Variables.arterialLimitLowMin - lowerBoundMax : Variables.arterialLimitLowMax - upperBoundMin : Variables.arterialLimitHighMin - upperBoundMax : Variables.arterialLimitHighMax - maximumMargin : Math.abs(Variables.arterialValueMax - Variables.arterialLimitHighMax) - limitGap : Variables.arterialLimitGap + minimumMargin : Math.abs(vTreatmentRanges.arterialPressureMonitorMin - vTreatmentRanges.arterialPressureLimitLowMin ) + lowerBoundMin : vTreatmentRanges.arterialPressureLimitLowMin + lowerBoundMax : vTreatmentRanges.arterialPressureLimitLowMin + upperBoundMin : vTreatmentRanges.arterialPressureLimitHighMin + upperBoundMax : vTreatmentRanges.arterialPressureLimitHighMax + maximumMargin : Math.abs(vTreatmentRanges.arterialPressureMonitorMax - vTreatmentRanges.arterialPressureLimitHighMax) + limitGap : vTreatmentRanges.arterialPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res step : arterialPressureStep } @@ -77,13 +77,13 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresVenousBar - minimumMargin : Math.abs(Variables.venousValueMin - Variables.venousLimitLowMin ) - lowerBoundMin : Variables.venousLimitLowMin - lowerBoundMax : Variables.venousLimitLowMax - upperBoundMin : Variables.venousLimitHighMin - upperBoundMax : Variables.venousLimitHighMax - maximumMargin : Math.abs(Variables.venousValueMax - Variables.venousLimitHighMax) - limitGap : Variables.venousLimitGap + minimumMargin : Math.abs(vTreatmentRanges.venousPressureMonitorMin - vTreatmentRanges.venousPressureLimitLowMin ) + lowerBoundMin : vTreatmentRanges.venousPressureLimitLowMin + lowerBoundMax : vTreatmentRanges.venousPressureLimitLowMin + upperBoundMin : vTreatmentRanges.venousPressureLimitHighMin + upperBoundMax : vTreatmentRanges.venousPressureLimitHighMax + maximumMargin : Math.abs(vTreatmentRanges.venousPressureMonitorMax - vTreatmentRanges.venousPressureLimitHighMax) + limitGap : vTreatmentRanges.venousPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res step : venousPressureStep } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -36,7 +36,7 @@ property int venousUpperBound : 0 property int venousMaximum : 0 - property int arterilPressure : 0 + property int arterialPressure : 0 property int venousPressure : 0 property bool valueOutRangeNotify : true @@ -75,7 +75,7 @@ lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum - value : _root.arterilPressure + value : _root.arterialPressure color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color Text { id: _arterialText Index: sources/main.h =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/main.h (.../main.h) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/main.h (.../main.h) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -111,8 +111,14 @@ #define SKIPPER_RST \ skipperCounter = 0 //--------------------------------------------------------------------------------// +#define DEBUG_PROPERTY_CHANGED(vVARIABLE, PREFIX) // qDebug() << "#" << #vVARIABLE << PREFIX##vVARIABLE; //--------------------------------------------------------------------------------// -#define DEBUG_PROPERTY_CHANGED(vVARIABLE, PREFIX) // qDebug() << "#" << #vVARIABLE << PREFIX##vVARIABLE; +#define FROMVARIANT(vVARIABLE, vGROUP, vKEY, vCONVERSION) \ +{ \ + bool ok = false; \ + vVARIABLE( _Settings.value(mCategory, vGROUP, vKEY).to##vCONVERSION(&ok) ); \ + if ( !ok ) LOG_DEBUG("incorrect configuration value for " #vVARIABLE); \ +} //--------------------------------------------------------------------------------// #define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ protected : \ Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rbddea62154aa84f8c4e54ccc536bc58124e40b1c -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision bddea62154aa84f8c4e54ccc536bc58124e40b1c) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -324,19 +324,12 @@ * */ class MAdjustPressuresLimitsReq : public MModel { - public: - static const qint32 ArterialLimitLowDef = -300; // PRS354 manufacturing default - static const qint32 ArterialLimitHighDef = 0; // PRS355 manufacturing default - static const qint32 VenousLimitLowDef = +20; // PRS356 manufacturing default - static const qint32 VenousLimitHighDef = +400; // PRS357 manufacturing default + 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) -public: - qint32 mArterialLimitLow = ArterialLimitLowDef ; ///< (S32) Arterial Pressure Limit Low (mmHg) - qint32 mArterialLimitHigh = ArterialLimitHighDef; ///< (S32) Arterial Pressure Limit High (mmHg) - qint32 mVenousLimitLow = VenousLimitLowDef ; ///< (S32) Venous Pressure Limit Low (mmHg) - qint32 mVenousLimitHigh = VenousLimitHighDef ; ///< (S32) Venous Pressure Limit High (mmHg) - // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 20-Oct-2022 + * \date (last) 23-Oct-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -22,10 +22,11 @@ void VTreatmentAdjustmentPressuresLimits::initConnections() { ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); ADJUST_VIEW_CONNECTION( AdjustPressuresLimitsRequestData); + ACTION_VIEW_CONNECTION( SettingsData); } /*! - * \brief VTreatmentAdjustmentPressures::onActionReceive + * \brief VTreatmentAdjustmentPressures::onActionReceive * \details Model data received message handler. * When signal received this method is called to update the view properties. * \param vData - Model data @@ -42,5 +43,29 @@ // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** - adjustment ( true ); + adjustment ( true ); } + +/*! + * \brief VTreatmentAdjustmentPressures::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + */ +void VTreatmentAdjustmentPressuresLimits::onActionReceive(const SettingsData &) +{ + QString mCategory = Storage::Settings_Category_ConfigurationsDataList; + + FROMVARIANT ( arterialPressureLimitLowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Def" , Int ); + FROMVARIANT ( arterialPressureLimitHighDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Def" , Int ); + FROMVARIANT ( venousPressureLimitLowDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Def" , Int ); + FROMVARIANT ( venousPressureLimitHighDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Def" , Int ); + + arterialLimitLow (_arterialPressureLimitLowDef ); + arterialLimitHigh (_arterialPressureLimitHighDef ); + venousLimitLow (_venousPressureLimitLowDef ); + venousLimitHigh (_venousPressureLimitHighDef ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -21,6 +21,7 @@ #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" +#include "MSettings.h" namespace View { @@ -39,29 +40,28 @@ AdjustPressuresLimitsRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment pressures limits data - PROPERTY( qint32 , arterialLimitLow , _data.ArterialLimitLowDef ) - PROPERTY( qint32 , arterialLimitHigh , _data.ArterialLimitHighDef ) - PROPERTY( qint32 , venousLimitLow , _data.VenousLimitLowDef ) - PROPERTY( qint32 , venousLimitHigh , _data.VenousLimitHighDef ) + PROPERTY( qint32 , arterialLimitLow , 0) + PROPERTY( qint32 , arterialLimitHigh , 0) + PROPERTY( qint32 , venousLimitLow , 0) + PROPERTY( qint32 , venousLimitHigh , 0) - // disabled coco begin validated: Tested manually - // these are manufacturing default values which will be assigned to the pressure parameters initially. - // since after the first change it will be overwritten by user value it has been provided here in case it is needed. - CONSTANT( qint32 , arterialLimitLowDef , _data.ArterialLimitLowDef ) // default by PRS354 - CONSTANT( qint32 , arterialLimitHighDef , _data.ArterialLimitHighDef ) // default by PRS355 - CONSTANT( qint32 , venousLimitLowDef , _data.VenousLimitLowDef ) // default by PRS356 - CONSTANT( qint32 , venousLimitHighDef , _data.VenousLimitHighDef ) // default by PRS357 - // disabled coco end - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) + READONLY( qint32 , arterialPressureLimitLowDef , 0) + READONLY( qint32 , arterialPressureLimitHighDef , 0) + READONLY( qint32 , venousPressureLimitLowDef , 0) + READONLY( qint32 , venousPressureLimitHighDef , 0) + VIEW_DEC_CLASS (VTreatmentAdjustmentPressuresLimits) + VIEW_DEC_SLOT (AdjustPressuresLimitsResponseData) + VIEW_DEC_SLOT (SettingsData) + + + // ----- Adjust Pressures Limits public slots: /*! Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -50,13 +50,6 @@ { QString mCategory = Storage::Settings_Category_ConfigurationsDataList; - #define FROMVARIANT(vVARIABLE, vGROUP, vKEY, vCONVERSION) \ - { \ - bool ok = false; \ - vVARIABLE( _Settings.value(mCategory, vGROUP, vKEY).to##vCONVERSION(&ok) ); \ - if ( !ok ) LOG_DEBUG("incorrect configuration value for " #vVARIABLE); \ - } - FROMVARIANT ( bloodFlowRateMin , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Min" , UInt ); FROMVARIANT ( bloodFlowRateMax , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Max" , UInt ); FROMVARIANT ( bloodFlowRateRes , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Res" , UInt ); @@ -114,6 +107,10 @@ FROMVARIANT ( arterialPressureLimitHighDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Def" , Int ); FROMVARIANT ( arterialPressureLimitHighGap , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Gap" , Int ); + FROMVARIANT ( arterialPressureMonitorMin , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Min" , Int ); + FROMVARIANT ( arterialPressureMonitorMax , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Max" , Int ); + FROMVARIANT ( arterialPressureMonitorRes , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Res" , Int ); + FROMVARIANT ( venousPressureLimitLowMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Min" , Int ); FROMVARIANT ( venousPressureLimitLowMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Max" , Int ); FROMVARIANT ( venousPressureLimitLowRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Res" , Int ); @@ -126,6 +123,10 @@ FROMVARIANT ( venousPressureLimitHighDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Def" , Int ); FROMVARIANT ( venousPressureLimitHighGap , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Gap" , Int ); + FROMVARIANT ( venousPressureMonitorMin , "Venous Blood Pressure Ranges" , "Venous_Monitor_Min" , Int ); + FROMVARIANT ( venousPressureMonitorMax , "Venous Blood Pressure Ranges" , "Venous_Monitor_Max" , Int ); + FROMVARIANT ( venousPressureMonitorRes , "Venous Blood Pressure Ranges" , "Venous_Monitor_Res" , Int ); + FROMVARIANT ( bloodPressureMeasureIntervalMin , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Min" , UInt ); FROMVARIANT ( bloodPressureMeasureIntervalMax , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Max" , UInt ); FROMVARIANT ( bloodPressureMeasureIntervalRes , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Res" , UInt ); Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -66,6 +66,9 @@ RANGESET( quint32 , bloodPressureMeasureInterval , 0) RANGESET( quint32 , rinsebackFlowRate , 0) + // monitoring ranges + RANGESET( qint32 , arterialPressureMonitor , 0) + RANGESET( qint32 , venousPressureMonitor , 0) VIEW_DEC_CLASS(VTreatmentRanges) VIEW_DEC_SLOT(TreatmentRangesData)