Index: denali.pro =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- denali.pro (.../denali.pro) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ denali.pro (.../denali.pro) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -191,7 +191,7 @@ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ \ # ---------- Models - HD - Adjustment - Disinfeection - sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h \ + sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ Index: main.cpp =================================================================== diff -u -rcb7d9e125fe619ab0713f9146e9774940e26a096 -r8be0073f796109578435eaa14edc7d3b9a2352da --- main.cpp (.../main.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) +++ main.cpp (.../main.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -301,7 +301,7 @@ version += ver_minor ; version += ver_micro ; version += ver_revis ; // build number - // TODO: version += ver_comp ; // removed for the phase 1 version + version += ver_comp ; QCoreApplication::setApplicationVersion(version); } Index: sources/ApplicationController.cpp =================================================================== diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 465a935949a85d3d1bebd11979737ff38ef96122) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -533,7 +533,6 @@ emit didSettingsDone(); } - /*! * \brief ApplicationController::onPOSTWiFi * \details Starts the WiFi Interface @@ -558,7 +557,6 @@ } } - /*! * \brief ApplicationController::onPOSTFail * \details sends the Alarm Trigger message, used when the POST Failed. Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -737,11 +737,11 @@ * \param vData - Data model contains the epoch time * \return void */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustDisinfectStartRequestData &vData) { QVariantList mData; mData += vData.mState; - onActionTransmit(GuiActionType::ID_AdjustDisinfectReq, mData); + onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); } /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -143,7 +143,7 @@ GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect - GuiActionType::ID_AdjustDisinfectReq , + GuiActionType::ID_AdjustDisinfectStartReq , // Settings GuiActionType::ID_AdjustServiceModeReq , GuiActionType::ID_AdjustVersionsUIReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -239,8 +239,8 @@ {Gui::GuiActionType::ID_AdjustDGDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Disinfect - {Gui::GuiActionType::ID_AdjustDisinfectReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDisinfectRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDisinfectStartReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDisinfectStartRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -281,7 +281,7 @@ case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection - case Gui::GuiActionType::ID_AdjustDisinfectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectRequestData ); break; + case Gui::GuiActionType::ID_AdjustDisinfectStartReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectStartRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; @@ -509,7 +509,7 @@ case Gui::GuiActionType::ID_TreatmentLogAlarmData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAlarmData ); break; case Gui::GuiActionType::ID_TreatmentLogEventData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogEventData ); break; // ----- Disinfection - Adjust - case Gui::GuiActionType::ID_AdjustDisinfectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp ); break; + case Gui::GuiActionType::ID_AdjustDisinfectStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); /* TODO : implement notify<>() */ break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); /* TODO : implement notify<>() */ break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -262,8 +262,10 @@ ID_TreatmentLogEventData = 0x9600, // 150 // Disinfect - ID_AdjustDisinfectReq = 0x7F00, // 127 - ID_AdjustDisinfectRsp = 0x8000, // 128 + ID_AdjustDisinfectModeReq = 0x9A00, // 154 + ID_AdjustDisinfectModeRsp = 0x9B00, // 155 + ID_AdjustDisinfectStartReq = 0x7F00, // 127 + ID_AdjustDisinfectStartRsp = 0x8000, // 128 }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 35db01154f90ebfdb6174033a66f5c20af82e14d) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -36,21 +36,45 @@ readonly property string heatTitle : qsTr("Heat Disinfect") readonly property string chemicalTitle : qsTr("Chemical Disinfect") + function doDisinfectBack () { + vDisinfectAdjustDisinfect .doDisinfectClear () + page ( _disinfectHome ) + } + function doDisinfectConfirm () { + vDisinfectAdjustDisinfect .doDisinfectConfirm () + } + function doDisinfectFlush () { + vDisinfectAdjustDisinfect .doDisinfectFlush () + page( _disinfectFlush ) + } + function doDisinfectHeat () { + vDisinfectAdjustDisinfect .doDisinfectHeat () + page( _disinfectHeat ) + } + function doDisinfectChemical() { + vDisinfectAdjustDisinfect .doDisinfectChemical() + page( _disinfectChemical ) + } + function doDisplayReasonText(vPage) { + if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } + else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } + } + DisinfectBase { id : _disinfectHome objectName : "_disinfectHome" property int stackStepIndex : 0 header.stepNames : [ _root.disinfectTitle ] title.text : _root.disinfectTitle footer.childrenWidth : 350 footer.children: [ - TouchRect { text.text: _root.flushTitle ; onClicked: page( _disinfectFlush )}, - TouchRect { text.text: _root.heatTitle ; onClicked: page( _disinfectHeat )}, - TouchRect { text.text: _root.chemicalTitle ; onClicked: page( _disinfectChemical )} + TouchRect { text.text: _root.flushTitle ; onClicked: { doDisinfectFlush () } }, + TouchRect { text.text: _root.heatTitle ; onClicked: { doDisinfectHeat () } }, + TouchRect { text.text: _root.chemicalTitle ; onClicked: { doDisinfectChemical () } } ] instructionBased : true - header.confirmVisible : vDisinfectAdjustDisinfect .canCancel // if initiated by User from setting can be canceled. + header.confirmVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. header.confirmText.text : qsTr("Cancel") - onConfirmClicked : { vDisinfectAdjustDisinfect .doCancel () } + onConfirmClicked : { vDisinfectAdjustDisinfect .doCancel () } } DisinfectBase { id : _disinfectFlush @@ -59,9 +83,9 @@ title.text : _root.flushTitle instructionBased : true header.backVisible : true - onBackClicked : { page ( _disinfectHome ) } header.confirmVisible : true - onConfirmClicked : { vDisinfectAdjustDisinfect .doFlush () } + onBackClicked : doDisinfectBack () + onConfirmClicked : doDisinfectConfirm () } DisinfectBase { id : _disinfectHeat @@ -70,9 +94,9 @@ title.text : _root.heatTitle instructionBased : true header.backVisible : true - onBackClicked : { page ( _disinfectHome ) } header.confirmVisible : true - onConfirmClicked : { vDisinfectAdjustDisinfect .doDisinfectHeat () } + onBackClicked : doDisinfectBack () + onConfirmClicked : doDisinfectConfirm () } DisinfectBase { id : _disinfectChemical @@ -81,25 +105,23 @@ title.text : _root.chemicalTitle instructionBased : true header.backVisible : true - onBackClicked : { page ( _disinfectHome ) } header.confirmVisible : true - onConfirmClicked : { vDisinfectAdjustDisinfect .doDisinfectChemical () } + onBackClicked : doDisinfectBack () + onConfirmClicked : doDisinfectConfirm () } // ----- Navigation Connections { target: vHDOperationMode - onStandbyWaitDisinfectChanged : { page( _disinfectHome , vstandbyWaitDisinfect )} // initialItem + onStandbyWaitDisinfectChanged : { page( _disinfectHome , vstandbyWaitDisinfect )} // initialItem } // ----- Responses Connections { target: vDisinfectAdjustDisinfect - onAdjustmentTriggered : { - if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _disinfectHome.reasonText = "" } - else { _disinfectHome.reasonText = vDisinfectAdjustDisinfect.text() } - } + onAdjustment_DisinfectStartFlushTriggered : { doDisplayReasonText( _disinfectFlush )} + onAdjustment_DisinfectStartHeatTriggered : { doDisplayReasonText( _disinfectHeat )} + onAdjustment_DisinfectStartChemicalTriggered : { doDisplayReasonText( _disinfectChemical )} } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/settings/SettingsDG.qml =================================================================== diff -u -r153bcdb67dca6c40022318b80d5c7079d48bb37f -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 153bcdb67dca6c40022318b80d5c7079d48bb37f) +++ sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -136,19 +136,16 @@ childrenWidth: parent.width / 3 children: [ TouchRect { text.text: qsTr("DG Cleaning") - onClicked: { vDisinfectAdjustDisinfect .doInitiate () } + onClicked: { vDisinfectAdjustDisinfect .doDisinfectInitiate () } } ] } // ----- Responses Connections { target: vDisinfectAdjustDisinfect - onAdjustmentTriggered : { - if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) { - _root.notificationText = "" - } else { - _root.notificationText = vDisinfectAdjustDisinfect.text() - } + onAdjustment_DisinfectModeTriggered: { + if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _root.notificationText = "" } + else { _root.notificationText = vDisinfectAdjustDisinfect.text() } } } } Index: sources/model/MModel.h =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/model/MModel.h (.../MModel.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ sources/model/MModel.h (.../MModel.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -135,7 +135,7 @@ #include "MTreatmentLogEventData.h" // Disinfection -#include "MDisinfectAdjustRequests.h" +#include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustResponse.h" /*! @@ -351,7 +351,7 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - REGISTER_METATYPE( AdjustDisinfectRequestData ) \ + REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ \ /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ @@ -585,7 +585,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -740,7 +740,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ @@ -790,7 +790,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ @@ -840,7 +840,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h =================================================================== diff -u --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h (revision 0) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -0,0 +1,67 @@ +/*! + * + * Copyright (c) 2021-2022 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 MDisinfectAdjustRequests.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 18-Apr-2021 + * + */ + +#pragma once + +// Qt +#include + +//project +#include "MAdjustRequestsBase.h" +#include "GuiGlobals.h" +#include "MessageGlobals.h" + +using namespace Gui; + +namespace Model { + +/*! + * Simple request models + * These are models to send the request for the doAdjustment + * The the only reason thy have been defined to help overloading the adjustment methods + * Otherwise the parameters are so tiny models. + */ + +/*! + * \brief The MAdjustDisinfectReq class + * \details The model to request heat/chemical disinfect + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x7F00| 0x100 | Req | Y | UI | HD | Flush, Heat/Chemical Disinfect Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref mState | + * + */ +class MAdjustDisinfectReq : public MModel { +public: + GuiDisinfectDGStates mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; + + // disabled coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({mState}); + } + // disabled coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DisinfectStart", vParameters); + } +}; + +} + +typedef Model:: MAdjustDisinfectReq AdjustDisinfectRequestData; Fisheye: Tag 8be0073f796109578435eaa14edc7d3b9a2352da refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -40,7 +40,7 @@ * | #2:(U32) | \ref Data::mReason | * * \sa Data - * \sa MAdjustDisinfectReq : Disinfect Request + * \sa MAdjustDisinfectStartReq : Disinfect Request * *

Logging info

* | || @@ -66,7 +66,7 @@ Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("AdjustDisinfect") ; } + QString infoText () const override { return QString("DisinfectStart" ) ; } struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (revision 0) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -0,0 +1,67 @@ +/*! + * + * Copyright (c) 2021-2022 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 MDisinfectAdjustRequests.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 18-Apr-2021 + * + */ + +#pragma once + +// Qt +#include + +//project +#include "MAdjustRequestsBase.h" +#include "GuiGlobals.h" +#include "MessageGlobals.h" + +using namespace Gui; + +namespace Model { + +/*! + * Simple request models + * These are models to send the request for the doAdjustment + * The the only reason thy have been defined to help overloading the adjustment methods + * Otherwise the parameters are so tiny models. + */ + +/*! + * \brief The MAdjustDisinfectStartReq class + * \details The model to request heat/chemical disinfect + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x7F00| 0x100 | Req | Y | UI | HD | Flush, Heat/Chemical Disinfect Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref mState | + * + */ +class MAdjustDisinfectStartReq : public MModel { +public: + GuiDisinfectDGStates mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; + + // disabled coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({mState}); + } + // disabled coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("DisinfectStart", vParameters); + } +}; + +} + +typedef Model::MAdjustDisinfectStartReq AdjustDisinfectStartRequestData; 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); } 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); }; }