Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rb41595237e9943f367b58b79e3304e5879719abf --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (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.h - * \author (last) Behrouz NematiPour - * \date (last) 18-Apr-2022 + * \author (last) Dara Navaei + * \date (last) 16-Jul-2024 * \author (original) Behrouz NematiPour * \date (original) 18-Apr-2021 * @@ -19,8 +19,10 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MDisinfectAdjustRequests.h" -#include "MDisinfectAdjustResponse.h" +#include "MDisinfectAdjustModeRequests.h" +#include "MDisinfectAdjustStartRequests.h" +#include "MDisinfectAdjustModeResponse.h" +#include "MDisinfectAdjustStartResponse.h" namespace View { @@ -38,32 +40,48 @@ // friends friend class ::tst_views; - AdjustDisinfectRequestData _data; + AdjustDisinfectStartRequestData _data; - // disabled coco begin validated: - // The property adjustment_Triggered has to be always true - // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0) - // disabled coco end + TRIGGER ( bool , adjustment_DisinfectMode , 0) + TRIGGER ( bool , adjustment_DisinfectStartFlush , 0) + TRIGGER ( bool , adjustment_DisinfectStartHeatActive , 0) + TRIGGER ( bool , adjustment_DisinfectStartChemical , 0) + TRIGGER ( bool , adjustment_DisinfectStartChemFlush , 0) + TRIGGER ( bool , adjustment_DisinfectStartROPermeate , 0) + TRIGGER ( bool , adjustment_DisinfectStartHeatPassive, 0) - PROPERTY( bool , flush , 0) - PROPERTY( bool , heat , 0) - PROPERTY( bool , chemical , 0) + PROPERTY( bool , hasCancel , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect, AdjustDisinfectResponseData) + VIEW_DEC_CLASS(VDisinfectAdjustDisinfect) + VIEW_DEC_SLOT(AdjustDisinfectModeResponseData) + VIEW_DEC_SLOT(AdjustDisinfectStartResponseData) public slots: - void doFlush (); - void doDisinfectHeat (); - void doDisinfectChemical (); + void doDisinfectInitiate (); + void doDisinfectCancel (); + void doDisinfectClear (); + void doDisinfectFlush (); + void doDisinfectHeatActiveCool (); + void doDisinfectChemical (); + void doDisinfectChemFlush (); + void doDisinfectROPermeate (); + void doDisinfectConfirm (); + void doDisinfectHeatPassiveCool (); + signals: /*! * \brief didAdjustment + * \details the notification signal to send the user's Disinfect Mode Request + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustDisinfectModeRequestData &vData); + + /*! + * \brief didAdjustment * \details the notification signal to send the user's Disinfect Request * \param vData - data model includes request information */ - void didAdjustment(const AdjustDisinfectRequestData &vData); + void didAdjustment(const AdjustDisinfectStartRequestData &vData); }; }