Index: denali.pro.user =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- denali.pro.user (.../denali.pro.user) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ denali.pro.user (.../denali.pro.user) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- en_US.udic (.../en_US.udic) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ en_US.udic (.../en_US.udic) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -76,3 +76,5 @@ DGChemical VDisinfect DGData +getter +VHDOperation Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -302,16 +302,16 @@ { bool ok = false; switch (vMessage.can_id) { - case eChlid_HD_UI : - case eChlid_HD_Alarm: - case eChlid_HD_Sync : ok = interpretMessage_HD(vMessage, vData); break; + case eChlid_HD_DG : // break; // 0x008 : to remove the channel from listen list remove the break comment + case eChlid_HD_UI : // break; // 0x020 : to remove the channel from listen list remove the break comment + case eChlid_HD_Alarm: // break; // 0x001 : to remove the channel from listen list remove the break comment + case eChlid_HD_Sync : /* 0x040 */ ok = interpretMessage_HD(vMessage, vData); break; - case eChlid_DG_HD : + case eChlid_DG_HD : // break; // 0x010 : to remove the channel from listen list remove the break comment + case eChlid_DG_UI : // break; // 0x070 : to remove the channel from listen list remove the break comment + case eChlid_DG_Alarm: // break; // 0x002 : to remove the channel from listen list remove the break comment + case eChlid_DG_Sync : /* 0x080 */ ok = interpretMessage_DG(vMessage, vData); break; - case eChlid_DG_UI : - // case eChlid_DG_Alarm: // commented out for now. Currently there is no message in this category. - case eChlid_DG_Sync : ok = interpretMessage_DG(vMessage, vData); break; - default: break; } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -299,6 +299,7 @@ #include "DGDefs.h" Q_ENUM(DG_Op_Modes) + Q_ENUM(DG_Heat_States) }; // to be able to use the enum as signal/slot parameter @@ -362,6 +363,9 @@ // Post-Treatment SubMode typedef GuiActions::HD_Post_Treatment_Mode_States GuiPostTreatmentStates; + // Disinfection Heat States + typedef GuiActions::DG_Heat_States GuiDisinfectDGHeatStates; + /*! * \brief enumString * \details converts the enum index to it's code defined text Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -63,7 +63,6 @@ font.pixelSize : Fonts.fontPixelNotification horizontalAlignment : Text.AlignHCenter verticalAlignment : Text.AlignVCenter - } MouseArea { Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -29,64 +29,98 @@ stackView.initialItem : null - signal disinfectionSkip () - signal disinfectionHeatClicked () - signal disinfectionChemicalClicked () - signal disinfectionChemicalConfirm () + signal disinfectSkip () + signal disinfectHeatClicked () + signal disinfectChemicalClicked () + signal disinfectChemicalConfirm () - DisinfectBase { id: _disinfection - objectName: "_disinfection" + readonly property string disinfectTitle : qsTr("Disinfection") + readonly property string flushTitle : qsTr("Flush") + readonly property string heatTitle : qsTr("Heat Disinfect") + readonly property string chemicalTitle : qsTr("Chemical Disinfect") + + DisinfectBase { id : _disinfect + objectName : "_disinfect" property int stackStepIndex : 0 - header.stepNames: [ qsTr("Disinfection") ] + header.stepNames : [ _root.disinfectTitle ] header.confirmVisible : true header.confirmText.text : qsTr("SKIP") - title.text : qsTr("Disinfection") + title.text : _root.disinfectTitle footer.childrenWidth : 350 footer.children: [ TouchRect { - text.text: qsTr("Heat Disinfection") - onClicked: _root.disinfectionHeatClicked() + text.text: _root.heatTitle + onClicked: _root.disinfectHeatClicked() }, TouchRect { - text.text: qsTr("Chemical Disinfection") - onClicked: _root.disinfectionChemicalClicked() + text.text: _root.chemicalTitle + onClicked: _root.disinfectChemicalClicked() } ] - onConfirmClicked : _root.disinfectionSkip() + onConfirmClicked : _root.disinfectSkip() + instructionBased : true } - DisinfectBase { id: _disinfectionHeat - objectName: "_disinfectionHeat" + DisinfectBase { id : _disinfectHeat + objectName : "_disinfectHeat" property int stackStepIndex : 1 - header.stepNames: [ qsTr("Disinfection") , qsTr("Heat Disinfect")] - title.text : qsTr("Heat Disinfection") + header.stepNames : [ _root.disinfectTitle , _root.heatTitle ] + title.text : _root.heatTitle hasTimeCircle : true + timeCircleMinimum : 0 + timeCircleMaximum : vDisinfectDGData.heatTimeTotal + timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed + timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60 + + hasCheckList : true + checkListStepNames : [ + qsTr("Running Pre-Disinfect Flush" ), + qsTr("Heating Up the Fluid" ), + qsTr("Running Heat Disinfect" ), + qsTr("Cooling Down" ), + qsTr("Running Post-Disinfect Flush"), + ] } - DisinfectBase { id: _disinfectionChemicalInstruction - objectName: "_disinfectionChemicalInstruction" + DisinfectBase { id : _disinfectChemicalInstruction + objectName : "_disinfectChemicalInstruction" property int stackStepIndex : 1 - header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")] + header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] + title.text : _root.chemicalTitle header.confirmVisible : true - title.text : qsTr("Chemical Disinfection") instructionBased : true - onConfirmClicked : _root.disinfectionChemicalConfirm() + onConfirmClicked : _root.disinfectChemicalConfirm() } - DisinfectBase { id: _disinfectionChemicalProgress - objectName: "_disinfectionChemicalProgress" + DisinfectBase { id : _disinfectChemicalProgress + objectName : "_disinfectChemicalProgress" property int stackStepIndex : 1 - header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")] - title.text : qsTr("Chemical Disinfection") + header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] + title.text : _root.chemicalTitle hasTimeCircle : true + timeCircleMinimum : 0 + timeCircleMaximum : vDisinfectDGData.chemicalTimeTotal + timeCircleProgressValue : vDisinfectDGData.chemicalTimeElapsed + timeCircleTimeTextValue : vDisinfectDGData.chemicalTimeRemaining * 60 + + hasCheckList : true + checkListStepNames : [ + qsTr("Running Pre-Disinfect Flush" ), + qsTr("Running Chemical Disinfect" ), + qsTr("Running Post-Disinfect Flush" ), + ] } - DisinfectBase { id: _flush - objectName: "_flush" + DisinfectBase { id : _flush + objectName : "_flush" property int stackStepIndex : 1 - header.stepNames: [ qsTr("Disinfection") , qsTr("Flush")] - title.text : qsTr("Flush") + header.stepNames : [ _root.disinfectTitle , _root.flushTitle ] + title.text : _root.flushTitle hasTimeCircle : true + timeCircleMinimum : 0 + timeCircleMaximum : vDisinfectDGData.flushTimeTotal + timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed + timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60 } Connections { target: vPostTreatmentStates @@ -96,17 +130,17 @@ } Connections { target: vHDOperationMode - onStandbyWaitDisinfectChanged : { page( _disinfection , vstandbyWaitDisinfect )} // initialItem - onStandbyDGFlushChanged : { page( _flush , vstandbyDGFlush )} - onStandbyDGDisinfectHeatChanged : { page( _disinfectionHeat , vstandbyDGDisinfectHeat )} - onStandbyDGDisinfectChemicalChanged : { page( _disinfectionChemicalProgress , vstandbyDGDisinfectChemical )} + onStandbyWaitDisinfectChanged : { page( _disinfect , vstandbyWaitDisinfect )} // initialItem + onStandbyDGFlushChanged : { page( _flush , vstandbyDGFlush )} + onStandbyDGDisinfectHeatChanged : { page( _disinfectHeat , vstandbyDGDisinfectHeat )} + onStandbyDGDisinfectChemicalChanged : { page( _disinfectChemicalProgress , vstandbyDGDisinfectChemical )} } - onDisinfectionSkip : { vDisinfectAdjustDisinfect.doFlush ( )} - onDisinfectionHeatClicked : { vDisinfectAdjustDisinfect.doDisinfectHeat ( )} - onDisinfectionChemicalClicked : { vDisinfectAdjustDisinfect.doDisinfectChemical ( ) - page( _disinfectionChemicalInstruction )} - onDisinfectionChemicalConfirm : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm( )} + onDisinfectSkip : { vDisinfectAdjustDisinfect.doFlush ( )} + onDisinfectHeatClicked : { vDisinfectAdjustDisinfect.doDisinfectHeat ( )} + onDisinfectChemicalClicked : { vDisinfectAdjustDisinfect.doDisinfectChemical ( ) + page( _disinfectChemicalInstruction )} + onDisinfectChemicalConfirm : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm( )} onVisibleChanged: { if (visible) { Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -72,6 +72,16 @@ onTreatmentReviewConfirm : { page( _disposablesRemovalConfirm )} onDisposablesRemovalConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( )} + Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm + onAdjustmentTriggered : { + if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) { + _disposablesRemovalConfirm.reasonText = "" + } else { + _disposablesRemovalConfirm.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/main.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/main.h (.../main.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/main.h (.../main.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -91,7 +91,7 @@ the notify signal (...Triggered) passes the new value as its parameter.\n \param new value */\ - void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ + void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ DEBUG_PROPERTY_CHANGED(vVARIABLE, v) \ _##vVARIABLE = v##vVARIABLE; \ emit vVARIABLE##Triggered( _##vVARIABLE ); \ Index: sources/model/MModel.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/MModel.h (.../MModel.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/MModel.h (.../MModel.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -283,7 +283,7 @@ /* Request */ \ /* Post-Treatment */ \ REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ - REGISTER_METATYPE( AdjustDisposablesConfirmRequestData ) \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ @@ -324,7 +324,7 @@ \ /* Response */ \ /* Post-Treatment */ \ - REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmResponseData ) \ REGISTER_METATYPE( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h (.../MDisinfectDGChemicalTBDData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h (.../MDisinfectDGChemicalTBDData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -30,9 +30,9 @@ * \brief The MDisinfectDGChemicalTBD class * \details The progress time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| - * |0x8600| 0x020 | 7 | 1 Hz | N | HD | All | Disinfect DG ChemicalTBD Progress | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x8600| 0x070 | 1 Hz | N | DG | UI | Disinfect DG ChemicalTBD Progress | * * | Payload || * | || Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h (.../MDisinfectDGChemicalTimeData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h (.../MDisinfectDGChemicalTimeData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -30,9 +30,9 @@ * \brief The MDisinfectDGChemicalTime class * \details The progress time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| - * |0x8500| 0x020 | 7 | 1 Hz | N | HD | All | Disinfect DG ChemicalTime Progress | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x8500| 0x070 | 1 Hz | N | DG | UI | Disinfect DG ChemicalTime Progress | * * | Payload || * | || Index: sources/model/dg/data/disinfect/MDisinfectDGFlushData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/dg/data/disinfect/MDisinfectDGFlushData.h (.../MDisinfectDGFlushData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/dg/data/disinfect/MDisinfectDGFlushData.h (.../MDisinfectDGFlushData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -30,9 +30,9 @@ * \brief The MDisinfectDGFlush class * \details The progress time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| - * |0x8200| 0x020 | 7 | 1 Hz | N | HD | All | Disinfect DG Flush Progress | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x8200| 0x070 | 1 Hz | N | DG | UI | Disinfect DG Flush Progress | * * | Payload || * | || Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h (.../MDisinfectDGHeatTemperatureData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h (.../MDisinfectDGHeatTemperatureData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -30,9 +30,9 @@ * \brief The MDisinfectDGHeatTemperature class * \details The progress time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| - * |0x8400| 0x020 | 7 | 1 Hz | N | HD | All | Disinfect DG HeatTemperature Progress | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x8400| 0x070 | 1 Hz | N | DG | UI | Disinfect DG HeatTemperature Progress | * * | Payload || * | || Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h (.../MDisinfectDGHeatTimeData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h (.../MDisinfectDGHeatTimeData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -30,9 +30,9 @@ * \brief The MDisinfectDGHeatTime class * \details The progress time data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:| - * |0x8300| 0x020 | 7 | 1 Hz | N | HD | All | Disinfect DG HeatTime Progress | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x8300| 0x070 | 1 Hz | N | DG | UI | Disinfect DG HeatTime Progress | * * | Payload || * | || Index: sources/view/dg/data/disinfect/VDisinfectDGData.cpp =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/view/dg/data/disinfect/VDisinfectDGData.cpp (.../VDisinfectDGData.cpp) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/view/dg/data/disinfect/VDisinfectDGData.cpp (.../VDisinfectDGData.cpp) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -34,9 +34,9 @@ */ void View::VDisinfectDGData::onActionReceive(const DisinfectDGFlushData &vData) { - flushTotal (vData.mTimeout ); - flushRemaining (vData.mCountdown ); - flushElapsed (vData.mTimeout - vData.mCountdown ); + flushTimeTotal (vData.mTimeout ); + flushTimeRemaining (vData.mCountdown ); + flushTimeElapsed (vData.mTimeout - vData.mCountdown ); } /*! Index: sources/view/dg/data/disinfect/VDisinfectDGData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -41,9 +41,9 @@ Q_OBJECT // DisinfectDGFlushData - PROPERTY( quint32 , flushTotal , 0) - PROPERTY( quint32 , flushRemaining , 0) - PROPERTY( quint32 , flushElapsed , 0) + PROPERTY( quint32 , flushTimeTotal , 0) + PROPERTY( quint32 , flushTimeRemaining , 0) + PROPERTY( quint32 , flushTimeElapsed , 0) // DisinfectDGHeatTimeData PROPERTY( quint32 , heatTimeTotal , 0) PROPERTY( quint32 , heatTimeRemaining , 0) Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VHDOperationModeData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 08-Sep-2020 - * \author (original) Behrouz NematiPour - * \date (original) 13-Aug-2020 + * \file VHDOperationModeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 19-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 19-Apr-2021 * */ #include "VHDOperationModeData.h" @@ -34,7 +34,6 @@ postTreatment ( vData.mOpMode == GuiHDOpModes ::MODE_POST ); invalidMode ( vData.mOpMode == GuiHDOpModes ::MODE_NLEG ); - if ( _standby ) { standbyStart ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_START_STATE ); standbyWaitTreatment ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_TREATMENT_STATE ); Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -rc71946746586d5a4061ad866ce7dbbaf74b9798a --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) @@ -51,12 +51,13 @@ PROPERTY( bool , postTreatment , false ) ///< Post-Treatment mode PROPERTY( bool , invalidMode , false ) ///< Not legal - an illegal mode transition occurred - PROPERTY( bool , standbyStart , false ) ///< Start standby , STANDBY_START_STATE = 0 - PROPERTY( bool , standbyWaitTreatment , false ) ///< Wait for treatment , STANDBY_WAIT_FOR_TREATMENT_STATE - PROPERTY( bool , standbyWaitDisinfect , false ) ///< Wait for disinfect , STANDBY_WAIT_FOR_DISINFECT_STATE - PROPERTY( bool , standbyDGFlush , false ) ///< DG flush operation is in progress , STANDBY_DG_FLUSH_IN_PROGRESS_STATE - PROPERTY( bool , standbyDGDisinfectHeat , false ) ///< DG heat disinfection operation is in progress , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE - PROPERTY( bool , standbyDGDisinfectChemical , false ) ///< DG chemical disinfection operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE + // these are triggers but shall only be triggered when in standby mode. + TRIGGER ( bool , standbyStart , false ) ///< Start standby , STANDBY_START_STATE = 0 + TRIGGER ( bool , standbyWaitTreatment , false ) ///< Wait for treatment , STANDBY_WAIT_FOR_TREATMENT_STATE + TRIGGER ( bool , standbyWaitDisinfect , false ) ///< Wait for disinfect , STANDBY_WAIT_FOR_DISINFECT_STATE + TRIGGER ( bool , standbyDGFlush , false ) ///< DG flush operation is in progress , STANDBY_DG_FLUSH_IN_PROGRESS_STATE + TRIGGER ( bool , standbyDGDisinfectHeat , false ) ///< DG heat disinfection operation is in progress , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE + TRIGGER ( bool , standbyDGDisinfectChemical , false ) ///< DG chemical disinfection operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE Q_PROPERTY(QString text READ text NOTIFY opModeChanged)