Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -24,7 +24,7 @@ * \details All the class signal/slot connections are defined here. */ void View::VDisinfectAdjustDisinfect::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustDisinfectRequestData); + ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData); ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData); } @@ -38,23 +38,51 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - 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. *** - adjustment ( true ); + qDebug() << _data.mState; + switch ( _data.mState ) { + case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE : adjustment_DisinfectStartHeat (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; + default: break; + } } /*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectInitiate + * \details Requests the Disinfection mode + */ +void View::VDisinfectAdjustDisinfect::doDisinfectInitiate() +{ + +} + +/*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectCancel + * \details Requests the Disinfection mode cancellation. + */ +void View::VDisinfectAdjustDisinfect::doDisinfectCancel() +{ + +} + +/*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectClear + */ +void View::VDisinfectAdjustDisinfect::doDisinfectClear() +{ + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; +} + +/*! * \brief View::VDisinfectAdjustDisinfect::doDisinfectFlush * \details the invocable slot to send user's Disinfect Flush Request + */ -void View::VDisinfectAdjustDisinfect::doFlush() +void View::VDisinfectAdjustDisinfect::doDisinfectFlush() { _data.mState = GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE; - emit didAdjustment(_data); } /*! @@ -64,7 +92,6 @@ void View::VDisinfectAdjustDisinfect::doDisinfectHeat() { _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE; - emit didAdjustment(_data); } /*! @@ -74,5 +101,9 @@ void View::VDisinfectAdjustDisinfect::doDisinfectChemical() { _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE; +} + +void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() +{ emit didAdjustment(_data); }