Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rffc365df26c29ff174ba037f0cf0794b27800792 -rb41595237e9943f367b58b79e3304e5879719abf --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision ffc365df26c29ff174ba037f0cf0794b27800792) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision b41595237e9943f367b58b79e3304e5879719abf) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * 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 VDisinfectAdjustDisinfect.cpp - * \author (last) Behrouz NematiPour - * \date (last) 25-Jun-2021 + * \author (last) Dara Navaei + * \date (last) 16-Jul-2024 * \author (original) Behrouz NematiPour * \date (original) 18-Apr-2021 * @@ -62,10 +62,13 @@ // *** 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. *** 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; + case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL : adjustment_DisinfectStartHeatActive (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive (true); break; + default: break; } } @@ -87,7 +90,6 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectCancel() { - hasCancel(false); AdjustDisinfectModeRequestData vData; vData.mInititate = Model::MAdjustDisinfectModeReq::eCancel; emit didAdjustment(vData); @@ -112,12 +114,12 @@ } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectHeat - * \details the invocable slot to send user's Disinfect Heat Request + * \brief View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool + * \details the invocable slot to send user's Disinfect Heat Request with active cool */ -void View::VDisinfectAdjustDisinfect::doDisinfectHeat() +void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE; + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL; } /*! @@ -129,7 +131,35 @@ _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE; } +/*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectChemFlush + * \details the invocable slot to send user's Disinfect Chemical Flush Request + */ +void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush() +{ + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE; +} + +/*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectROPermeate + * \details the invocable slot to send user's Disinfect RO Permeate Request + */ +void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate() +{ + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE; +} + +/*! + * \brief View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool + * \details the invocable slot to send user's Disinfect Heat Request with passive cool + */ +void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool() +{ + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL; +} + void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() { emit didAdjustment(_data); } +