Index: main.cpp =================================================================== diff -u -r45617764a63d5573bfb942b039f2854ed25ba15d -r95c671ab7037af055db551456a719ff67bf10262 --- main.cpp (.../main.cpp) (revision 45617764a63d5573bfb942b039f2854ed25ba15d) +++ main.cpp (.../main.cpp) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -112,7 +112,7 @@ QCoreApplication::translate("main", "Show the Message Output")); parser.addOption(optionConsoleoutFrameInterface); - // --- -0 : disable-keep-awake + // --- -0 : disable-keep-awake (the fast mode) QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "disable-keep-awake", QCoreApplication::translate("main", "Disable send low priority, empty message on the CANBus just to keep UI board CAN driver awake")); parser.addOption(optionSendEmptyKeepAwake); Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r34471900489397f483e052870ddc46059cef49fb -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 34471900489397f483e052870ddc46059cef49fb) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -39,6 +39,16 @@ minimum : 0 maximum : 0 + // real-time bound change should effect the current set value + onMinimumChanged: { + if (value < minimum ) + value = minimum + } + onMaximumChanged: { + if (value > maximum ) + value = maximum + } + minText { visible : true anchors.topMargin: Variables.sliderTextMargin Index: sources/gui/qml/main.qml =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/main.qml (.../main.qml) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/gui/qml/main.qml (.../main.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -109,8 +109,8 @@ VTreatmentTime { id: vTreatmentTime } VAlarmStatus { id: vAlarmStatus } VPowerOff { id: vPowerOff - onPoweroff_statusChanged: { - switch (vpoweroff_status) { + onPoweroffTriggered: { + switch (vpoweroff) { case GuiActions.Command: _powerOffDialog.open() break; Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r34471900489397f483e052870ddc46059cef49fb -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 34471900489397f483e052870ddc46059cef49fb) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -107,6 +107,7 @@ y : row3Y width : _flowsTouchArea.width title : qsTr("HEPARIN") + cumulativeVisible: false } // ---------- Center Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -37,9 +37,10 @@ property int textWidth : 200 titleText: qsTr("TREATMENT DURATION") + Connections { target: vTreatmentAdjustmentsResponse - onAdjustment_Duration_TriggeredChanged: { - if ( adjustment_Accepted ) { + onAdjustmentDurationTriggered: { + if ( vTreatmentAdjustmentsResponse.adjustment_Accepted ) { accept() } else { _durationSlider .value = vTreatmentAdjustmentsResponse.duration; @@ -52,22 +53,22 @@ spacing: 65 anchors.centerIn: parent TimeText { id: _currentTimeText - seconds: vTreatmentTime.time_Elapsed - secondsVisible: false + seconds: vTreatmentTime.time_Remaining + secondsVisible: true textPixelSize: Fonts.fontPixelDurationCurTime anchors.horizontalCenter: parent.horizontalCenter } Slider { id : _durationSlider anchors.horizontalCenter: parent.horizontalCenter width : 880 height : 5 - minimum : 60 * vTreatmentRanges.treatmentRanges_Duration_Min // to Minutes - maximum : 60 * vTreatmentRanges.treatmentRanges_Duration_Max // to Minutes + minimum : vTreatmentRanges.treatmentRanges_Duration_Min // in Minutes + maximum : vTreatmentRanges.treatmentRanges_Duration_Max // in Minutes step : Variables.durationResolution minText.visible: false maxText.visible: false TimeText { id: _durationText - seconds: 60 * _durationSlider.value // to Seconds + seconds: 60 * _durationSlider.value // in Minutes => to Seconds secondsVisible: false textPixelSize: Fonts.fontPixelDurationAdjTime textWeight: Font.Medium Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -50,8 +50,8 @@ } Connections { target: vTreatmentAdjustmentsResponse - onAdjustment_Flow_TriggeredChanged: { - if ( adjustment_Accepted ) { + onAdjustmentFlowTriggered: { + if ( vTreatmentAdjustmentsResponse.adjustment_Accepted ) { accept() } else { _bloodFlowSlider .value = vTreatmentAdjustmentsResponse. bloodFlow_FlowSetPoint; Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r45617764a63d5573bfb942b039f2854ed25ba15d -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -36,6 +36,8 @@ property int rowTextSpacing : 10 property int volumeTextWidth: 60 + property bool cumulativeVisible: true + // may need to be removed later when created separate Saline/Heparin object property string buttonText: "" @@ -129,6 +131,7 @@ } } Text { id: _cumulativeText + visible: cumulativeVisible anchors { left : parent.left top : _fluidProgressBar.bottom Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r95c671ab7037af055db551456a719ff67bf10262 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -39,6 +39,15 @@ orientation : TouchArea.Orientation.Vertical title : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") + Connections { target: vTreatmentAdjustmentsResponse + onAdjustmentDurationTriggered: { + } + onUltrafiltrationChanged: { + // As a reminder for later use + // console.debug("@",vTreatmentAdjustmentsResponse.ultrafiltration) + } + } + ProgressBarEx { id: _progressbarex y : 75 width : parent.width Index: sources/main.h =================================================================== diff -u -r31b9ae63410e7ca23f0f849e38368880e4c402b4 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/main.h (.../main.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) +++ sources/main.h (.../main.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -51,13 +51,13 @@ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; -#define PROPERTY(vTYPE , vVARIABLE , vDEFVALUE, vALWAYSEMIT ) \ +#define PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, vALWAYSEMIT, vSIGNAL) \ Q_PROPERTY(vTYPE vVARIABLE \ READ vVARIABLE \ WRITE vVARIABLE \ - NOTIFY vVARIABLE##Changed) \ + NOTIFY vVARIABLE##vSIGNAL) \ Q_SIGNALS: \ - void vVARIABLE##Changed \ + void vVARIABLE##vSIGNAL \ ( const vTYPE & v##vVARIABLE ); \ private: \ vTYPE _##vVARIABLE = vDEFVALUE; \ @@ -72,11 +72,17 @@ DEBUG_PROPERTY_CHANGED(vVARIABLE) \ init = true; \ _##vVARIABLE = v##vVARIABLE; \ - emit vVARIABLE##Changed( _##vVARIABLE ); \ + emit vVARIABLE##vSIGNAL( _##vVARIABLE ); \ } \ } //--------------------------------------------------------------------------------// +#define PROPERTY( vTYPE , vVARIABLE , vDEFVALUE ) \ + PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, false, Changed ) //--------------------------------------------------------------------------------// +#define TRIGGER( vTYPE , vVARIABLE, vDEFVALUE ) \ + PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, true , Triggered ) +//--------------------------------------------------------------------------------// +//--------------------------------------------------------------------------------// #define ACTION_METHOD_BRIDGE_CONNECTION(vMETHOD, vSOURCE, vTYPE) \ connect(&vSOURCE, SIGNAL(did##vMETHOD(const vTYPE &)), \ this , SLOT( on##vMETHOD(const vTYPE &))); Index: sources/view/valarmstatus.h =================================================================== diff -u -r6cf864fa54afe656a17daf797b2e2c130dfea90e -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision 6cf864fa54afe656a17daf797b2e2c130dfea90e) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -29,20 +29,20 @@ { Q_OBJECT - PROPERTY( quint32 , alarm_Priority , 0, false) - PROPERTY( quint32 , alarm_AlarmID , 0, false) - PROPERTY( quint32 , alarm_EscalateIn , 0, false) - PROPERTY( quint32 , alarm_MuteTimeout , 0, false) - PROPERTY( bool , alarm_Flag_systemFault , false, false) - PROPERTY( bool , alarm_Flag_stop , false, false) - PROPERTY( bool , alarm_Flag_noClear , false, false) - PROPERTY( bool , alarm_Flag_noResume , false, false) - PROPERTY( bool , alarm_Flag_noRinseback , false, false) - PROPERTY( bool , alarm_Flag_noEndTreatment , false, false) - PROPERTY( bool , alarm_Flag_noNewTreatment , false, false) - PROPERTY( bool , alarm_Flag_bypassDialyzer , false, false) - PROPERTY( bool , alarm_Flag_alarmsToEscalate , false, false) - PROPERTY( bool , alarm_Flag_alarmsSilenced , false, false) + PROPERTY( quint32 , alarm_Priority , 0) + PROPERTY( quint32 , alarm_AlarmID , 0) + PROPERTY( quint32 , alarm_EscalateIn , 0) + PROPERTY( quint32 , alarm_MuteTimeout , 0) + PROPERTY( bool , alarm_Flag_systemFault , false) + PROPERTY( bool , alarm_Flag_stop , false) + PROPERTY( bool , alarm_Flag_noClear , false) + PROPERTY( bool , alarm_Flag_noResume , false) + PROPERTY( bool , alarm_Flag_noRinseback , false) + PROPERTY( bool , alarm_Flag_noEndTreatment , false) + PROPERTY( bool , alarm_Flag_noNewTreatment , false) + PROPERTY( bool , alarm_Flag_bypassDialyzer , false) + PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) + PROPERTY( bool , alarm_Flag_alarmsSilenced , false) Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Index: sources/view/vpoweroff.cpp =================================================================== diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vpoweroff.cpp (.../vpoweroff.cpp) (revision 595ed1fbe8066960afd4c8fea168208e81b173d9) +++ sources/view/vpoweroff.cpp (.../vpoweroff.cpp) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -20,5 +20,5 @@ void VPowerOff::onActionReceive(const PowerOffData &vData) { - poweroff_status(vData.mStatus); + poweroff(vData.mStatus); } Index: sources/view/vpoweroff.h =================================================================== diff -u -rb72bdc52d8ca7336c83a817fa1839c3250fb4fda -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vpoweroff.h (.../vpoweroff.h) (revision b72bdc52d8ca7336c83a817fa1839c3250fb4fda) +++ sources/view/vpoweroff.h (.../vpoweroff.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -31,8 +31,9 @@ // to be always trigger the GUI // also since the signal passe parameter value is used the property getter in not currently used. // manually tested and all of them are working. - PROPERTY( quint8, poweroff_status, 0, true) + TRIGGER( quint8, poweroff, 0) // coco end + VIEW_DEC(VPowerOff, PowerOffData) }; Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -21,30 +21,7 @@ VIEW_DEF_CONNECTION_ADJUSTMENTS } -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustBloodDialysateResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - bloodFlow_FlowSetPoint ( vData.mBloodRate ); - dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); - // *** 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_Flow_Triggered( true ); -} - -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustDurationResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - UFVolume ( vData.mUFVolume ); - - // *** 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_Duration_Triggered( true ); -} - /*! * \brief VTreatmentAdjustmentsResponse::reasonText * \details this code is the place holder for the alarms description mapping @@ -70,3 +47,27 @@ text = reasonText(static_cast(_adjustment_Reason)); return text; } + +void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustBloodDialysateResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + bloodFlow_FlowSetPoint ( vData.mBloodRate ); + dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); + + // *** 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. *** + adjustmentFlow ( true ); +} + +void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustDurationResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ultrafiltration ( vData.mUFVolume ); + + // *** 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. *** + adjustmentDuration ( true ); +} Index: sources/view/vtreatmentadjustmentsresponse.h =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -36,25 +36,31 @@ // friends friend class ::tst_views; - PROPERTY( bool , adjustment_Accepted , 0, false) - // coco begin validated: The Reason property as quint32 is not used directly in GUI + // coco begin validated: + + // The Reason property as quint32 is not used directly in GUI // it will be used as QString text. // has been manually tested that it works perfectly fine if used. - PROPERTY( quint32 , adjustment_Reason , 0, false) - // coco end - PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0, false) - PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0, false) + PROPERTY( quint32 , adjustment_Reason , 0) - PROPERTY( quint32 , duration , 0, false) - PROPERTY( float , UFVolume , 0, false) - - // coco begin validated: The property adjustment_Triggered has to be always true + // 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 - PROPERTY( bool , adjustment_Flow_Triggered , 0, true ) - PROPERTY( bool , adjustment_Duration_Triggered , 0, true ) + TRIGGER( bool , adjustmentFlow , 0) + TRIGGER( bool , adjustmentDuration , 0) + // coco end + + // Treatment Blood/Dialysate Flow data + PROPERTY( bool , adjustment_Accepted , 0) + PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0) + + // Treatment Duration data + PROPERTY( quint32 , duration , 0) + PROPERTY( float , ultrafiltration , 0) + VIEW_DEC_CLASS(VTreatmentAdjustmentsResponse) VIEW_DEC_SLOT_ADJUSTMENTS Index: sources/view/vtreatmentbloodflow.h =================================================================== diff -u -r3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7) +++ sources/view/vtreatmentbloodflow.h (.../vtreatmentbloodflow.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,13 +27,13 @@ { Q_OBJECT - PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0, false) - PROPERTY( float , bloodFlow_MeasuredFlow , 0, false) - PROPERTY( float , bloodFlow_RotorSpeed , 0, false) - PROPERTY( float , bloodFlow_MotorSpeed , 0, false) - PROPERTY( float , bloodFlow_MotorCtlSpeed , 0, false) - PROPERTY( float , bloodFlow_MotorCtlCurrent, 0, false) - PROPERTY( float , bloodFlow_PWMDutyCycle , 0, false) + PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( float , bloodFlow_MeasuredFlow , 0) + PROPERTY( float , bloodFlow_RotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) + PROPERTY( float , bloodFlow_PWMDutyCycle , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) Index: sources/view/vtreatmentdialysateflow.h =================================================================== diff -u -r3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7) +++ sources/view/vtreatmentdialysateflow.h (.../vtreatmentdialysateflow.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,13 +27,13 @@ { Q_OBJECT - PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0, false) - PROPERTY( float , dialysateFlow_MeasuredFlow , 0, false) - PROPERTY( float , dialysateFlow_RotorSpeed , 0, false) - PROPERTY( float , dialysateFlow_MotorSpeed , 0, false) - PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0, false) - PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0, false) - PROPERTY( float , dialysateFlow_PWMDutyCycle , 0, false) + PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0) + PROPERTY( float , dialysateFlow_MeasuredFlow , 0) + PROPERTY( float , dialysateFlow_RotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) + PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) Index: sources/view/vtreatmentpressureocclusion.h =================================================================== diff -u -r11909fd034451197eeb590176e4a8c52657cdab8 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentpressureocclusion.h (.../vtreatmentpressureocclusion.h) (revision 11909fd034451197eeb590176e4a8c52657cdab8) +++ sources/view/vtreatmentpressureocclusion.h (.../vtreatmentpressureocclusion.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,13 +27,13 @@ { Q_OBJECT - PROPERTY( float, pressureocclusion_ArterialPressure , 0, false) - PROPERTY( float, pressureocclusion_VenousPressure , 0, false) + PROPERTY( float, pressureocclusion_ArterialPressure , 0) + PROPERTY( float, pressureocclusion_VenousPressure , 0) // coco begin validated: These three properties have not been used in GUI. // has been manually tested that it works perfectly fine if used. - PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0, false) - PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0, false) - PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0, false) + PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0) + PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0) + PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0) // coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) Index: sources/view/vtreatmentranges.h =================================================================== diff -u -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentranges.h (.../vtreatmentranges.h) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) +++ sources/view/vtreatmentranges.h (.../vtreatmentranges.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,15 +27,12 @@ { Q_OBJECT - // coco begin validated: The Treatment Duration properties have not been used in GUI. - // has been manually tested that it works perfectly fine if used. - PROPERTY( quint32, treatmentRanges_Duration_Min , 0, false) - PROPERTY( quint32, treatmentRanges_Duration_Max , 0, false) - // coco end - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0, false) - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0, false) - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0, false) - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max , 0, false) + PROPERTY( quint32, treatmentRanges_Duration_Min , 0) + PROPERTY( quint32, treatmentRanges_Duration_Max , 0) + PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0) + PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0) + PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0) + PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max , 0) VIEW_DEC(VTreatmentRanges, TreatmentRangesData) Index: sources/view/vtreatmenttime.h =================================================================== diff -u -r3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmenttime.h (.../vtreatmenttime.h) (revision 3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7) +++ sources/view/vtreatmenttime.h (.../vtreatmenttime.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,9 +27,9 @@ { Q_OBJECT - PROPERTY( quint32 , time_Total , 0, false) - PROPERTY( quint32 , time_Elapsed , 0, false) - PROPERTY( quint32 , time_Remaining , 0, false) + PROPERTY( quint32 , time_Total , 0) + PROPERTY( quint32 , time_Elapsed , 0) + PROPERTY( quint32 , time_Remaining , 0) VIEW_DEC(VTreatmentTime, TreatmentTimeData) Index: sources/view/vtreatmentultrafiltration.h =================================================================== diff -u -r3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision 3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7) +++ sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -27,13 +27,13 @@ { Q_OBJECT - PROPERTY( float, ultrafiltration_RefUFVol , 0, false) - PROPERTY( float, ultrafiltration_MeasUFVol , 0, false) - PROPERTY( float, ultrafiltration_RotorSpeed , 0, false) - PROPERTY( float, ultrafiltration_MotorSpeed , 0, false) - PROPERTY( float, ultrafiltration_MotorCtlSpeed , 0, false) - PROPERTY( float, ultrafiltration_MotorCtlCurrent, 0, false) - PROPERTY( float, ultrafiltration_PWMDtCycle , 0, false) + PROPERTY( float, ultrafiltration_RefUFVol , 0) + PROPERTY( float, ultrafiltration_MeasUFVol , 0) + PROPERTY( float, ultrafiltration_RotorSpeed , 0) + PROPERTY( float, ultrafiltration_MotorSpeed , 0) + PROPERTY( float, ultrafiltration_MotorCtlSpeed , 0) + PROPERTY( float, ultrafiltration_MotorCtlCurrent, 0) + PROPERTY( float, ultrafiltration_PWMDtCycle , 0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData)