Index: denali.pro.user =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- denali.pro.user (.../denali.pro.user) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ denali.pro.user (.../denali.pro.user) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -314,21 +314,14 @@ Q_ENUM(HD_Pre_Treatment_Prime_States) // Pre-Treatment Recirculate Q_ENUM(HD_Pre_Treatment_Recirc_States) + // Disinfection + Q_ENUM(DG_Disinfect_States) #include "DGDefs.h" Q_ENUM(DG_Op_Modes) Q_ENUM(DG_Flush_UI_States) Q_ENUM(DG_Heat_UI_States) Q_ENUM(DG_Chem_UI_States) - - // TODO : temporary enum until DG defines one - enum DG_Disinfect_States { - DG_DISINFECT_STATE_UNKNOWN = -1, - DG_DISINFECT_STATE_FLUSH = 0, - DG_DISINFECT_STATE_HEAT = 1, - DG_DISINFECT_STATE_CHEM = 2, - }; - Q_ENUM(DG_Disinfect_States) }; // to be able to use the enum as signal/slot parameter Index: sources/gui/qml/components/EntryDialog.qml =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/gui/qml/components/EntryDialog.qml (.../EntryDialog.qml) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ sources/gui/qml/components/EntryDialog.qml (.../EntryDialog.qml) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -22,7 +22,7 @@ /*! * \brief EntryDialog is a dialog like scree - * This screen has been disigned to be able to accept user inputs like TextEntry + * This screen has been designed to be able to accept user inputs like TextEntry * which requires Keyboard since the dialogs will cover the keyboard */ Rectangle { id: _root Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -24,7 +24,7 @@ /*! * \brief The Check list view is a dynamic check list items which gets list of strings as model * \details and dynamically creates list of items which can be later set as started/done to have - * busy circile or check mark as done. + * bussy circle or check mark as done. */ Item { id: _root property int labelWidth : 200 Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h (.../MDisinfectAdjustRequests.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h (.../MDisinfectAdjustRequests.h) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -49,7 +49,7 @@ */ class MAdjustDisinfectReq : public MModel { public: - GuiDisinfectDGStates mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_UNKNOWN; + GuiDisinfectDGStates mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -64,8 +64,8 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } QString infoText () const override { return QString("AdjustDisinfect") ; } struct Data { Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r1585eedd8c283bd36522ff7afe99ad99b0997a93 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1585eedd8c283bd36522ff7afe99ad99b0997a93) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 21-Jun-2021 + * \date (last) 25-Jun-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/dg/data/disinfect/VDisinfectStatesData.cpp =================================================================== diff -u -r42c029b1704455433cb095d2e76dcd540c1f0046 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/view/dg/data/disinfect/VDisinfectStatesData.cpp (.../VDisinfectStatesData.cpp) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) +++ sources/view/dg/data/disinfect/VDisinfectStatesData.cpp (.../VDisinfectStatesData.cpp) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -33,7 +33,7 @@ chemicalState ( vData.mChemicalStates ); // Flush Mode - bool mFlush = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_STATE_FLUSH ; + bool mFlush = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_FLUSH_STATE ; if ( mFlush ) { flushNotRunning ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_NOT_RUNNING ); flushDrainBeforeFlush ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_DRAIN_DEVICE ); @@ -46,7 +46,7 @@ flush( mFlush ); // Heat Mode - bool mHeat = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_STATE_HEAT ; + bool mHeat = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_HEAT_STATE ; if ( mHeat ) { heatNotRunning ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_NOT_RUNNING ); heatFlushBeforeDisinfect ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT ); @@ -62,7 +62,7 @@ heat( mHeat ); // Chemical Mode - bool mChemical = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_STATE_CHEM ; + bool mChemical = vData.mSubMode == GuiDisinfectDGStates ::DG_DISINFECT_CHEM_STATE ; if ( mChemical ) { chemicalNotRunning ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_NOT_RUNNING ); chemicalFlushBeforeDisinfect ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT ); Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r6233e005c77ee0aa10e80c02254a21f2042b840b --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 6233e005c77ee0aa10e80c02254a21f2042b840b) @@ -38,9 +38,9 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - flush ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_STATE_FLUSH ); - heat ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_STATE_HEAT ); - chemical ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_STATE_CHEM ); + flush ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE ); + heat ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE ); + chemical ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE ); // *** 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. *** @@ -53,7 +53,7 @@ */ void View::VDisinfectAdjustDisinfect::doFlush() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_FLUSH; + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE; emit didAdjustment(_data); } @@ -63,7 +63,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectHeat() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_HEAT; + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE; emit didAdjustment(_data); } @@ -73,6 +73,6 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectChemical() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_CHEM; + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE; emit didAdjustment(_data); }