Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 35db01154f90ebfdb6174033a66f5c20af82e14d) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -19,7 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MDisinfectAdjustRequests.h" +#include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustResponse.h" namespace View { @@ -38,34 +38,33 @@ // 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_DisinfectStartHeat , 0) + TRIGGER ( bool , adjustment_DisinfectStartChemical , 0) - PROPERTY( bool , flush , 0) - PROPERTY( bool , heat , 0) - PROPERTY( bool , chemical , 0) + PROPERTY( bool , hasCancel , 0) - PROPERTY( bool , canCancel , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect, AdjustDisinfectResponseData) public slots: - void doFlush (); - void doDisinfectHeat (); - void doDisinfectChemical (); + void doDisinfectInitiate (); + void doDisinfectCancel (); + void doDisinfectClear (); + void doDisinfectFlush (); + void doDisinfectHeat (); + void doDisinfectChemical (); + void doDisinfectConfirm (); + signals: /*! * \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); }; }