Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -24,7 +24,6 @@ */ void View::VDisinfectAdjustDisinfect::initConnections() { ADJUST_VIEW_CONNECTION(AdjustDisinfectRequestData); - ADJUST_VIEW_CONNECTION(AdjustDisinfectChemicalConfirmRequestData); ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData); } @@ -38,6 +37,10 @@ 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 ); + // *** 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 ); @@ -49,9 +52,8 @@ */ void View::VDisinfectAdjustDisinfect::doFlush() { - AdjustDisinfectRequestData data; - data.mState = AdjustDisinfectRequestData::eFlush; - emit didAdjustment(data); + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_FLUSH; + emit didAdjustment(_data); } /*! @@ -60,9 +62,8 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectHeat() { - AdjustDisinfectRequestData data; - data.mState = AdjustDisinfectRequestData::eHeat; - emit didAdjustment(data); + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_HEAT; + emit didAdjustment(_data); } /*! @@ -71,17 +72,6 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectChemical() { - AdjustDisinfectRequestData data; - data.mState = AdjustDisinfectRequestData::eChemical; - emit didAdjustment(data); + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_STATE_CHEM; + emit didAdjustment(_data); } - -/*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectChemicalConfirm - * \details the invocable slot to send user's Disinfect Chemical Confirm - */ -void View::VDisinfectAdjustDisinfect::doDisinfectChemicalConfirm() { - AdjustDisinfectChemicalConfirmRequestData data; - emit didAdjustment(data); -} -