Index: denali.pro.user =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r4bbec52d2257cfdef37604e3453846e501a2af91 --- denali.pro.user (.../denali.pro.user) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ denali.pro.user (.../denali.pro.user) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r4bbec52d2257cfdef37604e3453846e501a2af91 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) @@ -170,6 +170,7 @@ Q_ENUM(Treatment_States) Q_ENUM(UF_Commands) Q_ENUM(UF_States) + Q_ENUM(Saline_Commands) Q_ENUM(Saline_Bolus_States) // Heparin Q_ENUM(Heparin_Commands) @@ -196,6 +197,7 @@ typedef GuiActions::Treatment_States GuiTreatmentStates; typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_States GuiUFStates; + typedef GuiActions::Saline_Commands GuiSalineCommands; typedef GuiActions::Saline_Bolus_States GuiSalineStates; typedef GuiActions::Heparin_Commands GuiHeparinCommands; typedef GuiActions::Heparin_States GuiHeparinStates; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r4bbec52d2257cfdef37604e3453846e501a2af91 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) @@ -246,17 +246,7 @@ */ class MAdjustSalineReq : public MModel { public: - /*! - * \brief The State enum - * \details The saline bolus requested state. - * There is no FW shared enum for this so has been defined here as documented in "Messages List". - */ - enum State { - eStop = 0, - eStart = 1, - }; - - State requestedState = eStop; // the requested state. Initially it's Stop => start. + GuiSalineCommands requestedState = GuiSalineCommands::SALINE_CMD_STOP; // the requested state. Initially it's Stop => start. // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp =================================================================== diff -u -r767367e5779764bec1c1857f32eaf3d86089d5d9 -r4bbec52d2257cfdef37604e3453846e501a2af91 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) @@ -48,10 +48,10 @@ // be careful the response enum (GuiSalineStates) is // different than request enum (AdjustSalineRequestData) if ( state() == GuiSalineStates::SALINE_BOLUS_STATE_IN_PROGRESS ) { - _data.requestedState = AdjustSalineRequestData::eStop; + _data.requestedState = GuiSalineCommands::SALINE_CMD_STOP; } else { - _data.requestedState = AdjustSalineRequestData::eStart; + _data.requestedState = GuiSalineCommands::SALINE_CMD_START; } emit didAdjustment(_data); // notify the controllers to do the adjustment }