Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rba928149acf9501b0ab751eab84f4b7e8ac05353 -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -510,7 +510,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_AdjustDisinfectStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp ); 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/model/MModel.h =================================================================== diff -u -rba928149acf9501b0ab751eab84f4b7e8ac05353 -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/model/MModel.h (.../MModel.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) +++ sources/model/MModel.h (.../MModel.h) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -396,7 +396,7 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - REGISTER_METATYPE( AdjustDisinfectResponseData ) \ + REGISTER_METATYPE( AdjustDisinfectStartResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -518,7 +518,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartResponseData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ @@ -693,7 +693,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectStartResponseData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ @@ -953,7 +953,7 @@ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_SIGNAL( AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDisinfectStartResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp (.../MDisinfectAdjustResponse.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp (.../MDisinfectAdjustResponse.cpp) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -16,14 +16,14 @@ using namespace Model; -QVariantList MAdjustDisinfectResponse::parameters() const { +QVariantList MAdjustDisinfectStartResponse::parameters() const { return { _data.mAccepted.value, _data.mReason .value, }; } -bool MAdjustDisinfectResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustDisinfectStartResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) @@ -33,11 +33,11 @@ } /*! - * \brief MAdjustDisinfectResponse::data + * \brief MAdjustDisinfectStartResponse::data * \details Provides model's Data from the received messages data values * \return Data */ -AdjustDisinfectResponseData MAdjustDisinfectResponse::data() const { +AdjustDisinfectStartResponseData MAdjustDisinfectStartResponse::data() const { Data data; data.mAccepted = _data.mAccepted.value; data.mReason = _data.mReason .value; Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h (.../MDisinfectAdjustResponse.h) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -27,7 +27,7 @@ namespace Model { /*! - * \brief The MAdjustDisinfectResponse class + * \brief The MAdjustDisinfectStartResponse class * \details The Disinfect adjustment response model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | @@ -50,7 +50,7 @@ * | infoText | AdjustDisinfect | * */ -class MAdjustDisinfectResponse : public MAbstract { +class MAdjustDisinfectStartResponse : public MAbstract { // friends friend class ::tst_models; @@ -73,11 +73,11 @@ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ }; - MAdjustDisinfectResponse () { } + MAdjustDisinfectStartResponse () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MAdjustDisinfectResponse::Data AdjustDisinfectResponseData; +typedef Model::MAdjustDisinfectStartResponse::Data AdjustDisinfectStartResponseData; Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rba928149acf9501b0ab751eab84f4b7e8ac05353 -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -27,15 +27,15 @@ ADJUST_VIEW_CONNECTION(AdjustDisinfectModeRequestData); ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData); - ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData); + ACTION_VIEW_CONNECTION(AdjustDisinfectStartResponseData); } /*! * \brief VDisinfectAdjustDisinfect::onActionReceive * \details received response model data handler * \param vData - model data */ -void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectResponseData &vData) +void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectStartResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -rba928149acf9501b0ab751eab84f4b7e8ac05353 -r63bd08ce9c25b414882289dce5cada8dfcd7eb0e --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 63bd08ce9c25b414882289dce5cada8dfcd7eb0e) @@ -48,7 +48,7 @@ PROPERTY( bool , hasCancel , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect, AdjustDisinfectResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect, AdjustDisinfectStartResponseData) public slots: void doDisinfectInitiate ();