Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -669,14 +669,14 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message. + * \details This method transmits the Patient Disconnection Notification Adjustment Denali message. * \param vData - Data model contains Patient Disconnection Confirm adjustment. * \return void */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) +void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectionConfirmReq, mData); + onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectionNotifyReq, mData); } /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -144,7 +144,7 @@ GuiActionType::ID_AdjustRecirculateReq , GuiActionType::ID_AdjustTreatmentEndReq , // Post-Treatment - GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , + GuiActionType::ID_AdjustPatientDisconnectionNotifyReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect GuiActionType::ID_AdjustDisinfectModeReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r611bbf4dcba67768db87cf30f21fd2db788f677d -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 611bbf4dcba67768db87cf30f21fd2db788f677d) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -209,11 +209,11 @@ // ---- Post-Treatment // ---- Patient Disconnect - {Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdjustPatientDisconnectionNotifyReq , 0 * 4 }, // 0 parameter // ---- Disposables Removal {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp , 2 * 4 }, // 2 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rb9d5efd980be633f5d0bd92cc76295f3a0669db4 -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b9d5efd980be633f5d0bd92cc76295f3a0669db4) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -265,7 +265,7 @@ case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData ); break; // Post-Treatment - case Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustPatientDisconnectionNotifyReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData ); break; case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection @@ -496,7 +496,7 @@ case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; // ----- Post-Treatment Adjust - case Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp); break; case Gui::GuiActionType::ID_AdjustTreatmentLogRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentLogRsp ); break; // ----- Treatment Log case Gui::GuiActionType::ID_TreatmentLogAvrgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAvrgeData ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r611bbf4dcba67768db87cf30f21fd2db788f677d -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 611bbf4dcba67768db87cf30f21fd2db788f677d) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -252,11 +252,11 @@ // Post-Treatment // Patient Disconnect - ID_AdjustPatientDisconnectionConfirmReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustPatientDisconnectionNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Disposables Removal ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 - ID_AdjustDisposableRemovalConfirmRsp = 0x7400, // 116 + ID_AdjustDisposablesRemovalConfirmRsp = 0x7400, // 116 // Treatment Log Adjs ID_AdjustTreatmentLogReq = 0x7500, // 117 Index: sources/model/MModel.h =================================================================== diff -u -r611bbf4dcba67768db87cf30f21fd2db788f677d -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/model/MModel.h (.../MModel.h) (revision 611bbf4dcba67768db87cf30f21fd2db788f677d) +++ sources/model/MModel.h (.../MModel.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -359,7 +359,7 @@ REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ /* Request */ \ /* Post-Treatment */ \ - REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ + REGISTER_METATYPE( AdjustPatientDisconnectionNotifyRequestData ) \ REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -611,7 +611,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -780,7 +780,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -837,7 +837,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -894,7 +894,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -34,7 +34,7 @@ */ /*! - * \brief The MAdjustPatientDisconnectionConfirmReq class + * \brief The MAdjustPatientDisconnectionNotifyReq class * \details The model to Confirm Patient Disconnection * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -46,7 +46,7 @@ * | None || * */ -class MAdjustPatientDisconnectionConfirmReq : public MModel { +class MAdjustPatientDisconnectionNotifyReq : public MModel { public: // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. @@ -55,7 +55,7 @@ } // disabled coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("PatientDisconnectionConfirm", vParameters); + return MModel::toString("PatientDisconnectionNotify", vParameters); } }; @@ -113,6 +113,6 @@ } -typedef Model:: MAdjustPatientDisconnectionConfirmReq AdjustPatientDisconnectionConfirmRequestData; +typedef Model:: MAdjustPatientDisconnectionNotifyReq AdjustPatientDisconnectionNotifyRequestData; typedef Model:: MAdjustDisposablesRemovalConfirmReq AdjustDisposablesRemovalConfirmRequestData; typedef Model:: MAdjustTreatmentLogReq AdjustTreatmentLogRequestData; Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp (.../VPostTreatmentAdjustPatientDisconnectionConfirm.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp (.../VPostTreatmentAdjustPatientDisconnectionConfirm.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -23,14 +23,14 @@ \details All the class signal/slot connections are defined here. */ void View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustPatientDisconnectionConfirmRequestData); + ADJUST_VIEW_CONNECTION(AdjustPatientDisconnectionNotifyRequestData); } /*! * \brief View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doConfirm * \details the invocable slot to send user's Patient Disconnection confirm */ void View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doConfirm() { - AdjustPatientDisconnectionConfirmRequestData data; + AdjustPatientDisconnectionNotifyRequestData data; emit didAdjustment(data); } Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rf77d1595d633632cdedc5095a0cac07a7cca1251 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) @@ -54,6 +54,6 @@ * \details the notification signal to send the user's Patient Disconnection confirm * \param vData - data model includes request information */ - void didAdjustment(const AdjustPatientDisconnectionConfirmRequestData &vData); + void didAdjustment(const AdjustPatientDisconnectionNotifyRequestData &vData); }; }