Index: denali.pro =================================================================== diff -u -ra925df649b7f9cbf031e127aebd45f6f94e29284 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- denali.pro (.../denali.pro) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) +++ denali.pro (.../denali.pro) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -312,7 +312,6 @@ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ - sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h \ \ # ---------- Views - HD - Data - States sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ @@ -566,7 +565,6 @@ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ - sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp \ \ # ---------- Views - HD - States Data sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rcb7d9e125fe619ab0713f9146e9774940e26a096 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -746,18 +746,6 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Chemical Confirm request Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustChemicalConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustChemicalConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment * \details This method transmits the UI power on self test final result * \param vData - Data model contains the final result of the UI POST * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -144,7 +144,6 @@ GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect GuiActionType::ID_AdjustDisinfectReq , - GuiActionType::ID_AdjustChemicalConfirmReq , // Settings GuiActionType::ID_AdjustServiceModeReq , GuiActionType::ID_AdjustVersionsUIReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -ra925df649b7f9cbf031e127aebd45f6f94e29284 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -242,7 +242,6 @@ // ---- Disinfect {Gui::GuiActionType::ID_AdjustDisinfectReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustDisinfectRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustChemicalConfirmReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustChemicalConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -ra925df649b7f9cbf031e127aebd45f6f94e29284 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -282,7 +282,6 @@ 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_AdjustChemicalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustChemicalConfirmRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rf1bc4aa93887970b32b81f0c65d8889a662fa390 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -116,7 +116,6 @@ #include "VPostTreatmentAdjustTreatmentLog.h" // ----- Disinfection #include "VDisinfectAdjustDisinfect.h" -#include "VDisinfectAdjustChemicalConfirm.h" // ----- #include "VTreatmentAdjustmentEnd.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -ra925df649b7f9cbf031e127aebd45f6f94e29284 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -265,7 +265,6 @@ // Disinfect ID_AdjustDisinfectReq = 0x7F00, // 127 ID_AdjustDisinfectRsp = 0x8000, // 128 - ID_AdjustChemicalConfirmReq = 0x8100, // 129 ID_AdjustChemicalConfirmRsp = 0x8200, // 130 }; Index: sources/gui/qml/main.qml =================================================================== diff -u -rf1bc4aa93887970b32b81f0c65d8889a662fa390 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/gui/qml/main.qml (.../main.qml) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) +++ sources/gui/qml/main.qml (.../main.qml) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -110,7 +110,6 @@ import VPostTreatmentAdjustmentTreatmentLog 0.1 // Disinfection import VDisinfectAdjustDisinfect 0.1 -import VDisinfectAdjustChemicalConfirm 0.1 // Qml imports import "qrc:/globals" @@ -217,7 +216,6 @@ // --- Disinfection VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } - VDisinfectAdjustChemicalConfirm { id: vDisinfectAdjustChemicalConfirm } Background {} Index: sources/model/MModel.h =================================================================== diff -u -ra925df649b7f9cbf031e127aebd45f6f94e29284 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/model/MModel.h (.../MModel.h) (revision a925df649b7f9cbf031e127aebd45f6f94e29284) +++ sources/model/MModel.h (.../MModel.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -355,7 +355,6 @@ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ REGISTER_METATYPE( AdjustDisinfectRequestData ) \ - REGISTER_METATYPE( AdjustChemicalConfirmRequestData ) \ \ /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ @@ -593,7 +592,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustChemicalConfirmRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -751,7 +749,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ @@ -802,7 +799,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ @@ -853,7 +849,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h (.../MDisinfectAdjustRequests.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h (.../MDisinfectAdjustRequests.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -62,33 +62,6 @@ } }; -/*! - * \brief The MAdjustDisinfectChemicalConfirmReq class - * \details The model to Confirm Disposables Removal - * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0x8100| 0x100 | Req | Y | UI | HD | Chemical Disinfection User Confirm Request | - * - * | Payload || - * | || - * | None || - * - */ -class MAdjustDisinfectChemicalConfirmReq : public MModel { -public: - // 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({}); - } - // disabled coco end - static QString toString(const QVariantList &vParameters) { - return MModel::toString("DisinfectChemicalConfirm", vParameters); - } -}; - } typedef Model:: MAdjustDisinfectReq AdjustDisinfectRequestData; -typedef Model:: MAdjustDisinfectChemicalConfirmReq AdjustChemicalConfirmRequestData; Index: sources/view/VView.h =================================================================== diff -u -rf1bc4aa93887970b32b81f0c65d8889a662fa390 -r719d1f34d076dba98ec80e7d9b3994a58d54d720 --- sources/view/VView.h (.../VView.h) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) +++ sources/view/VView.h (.../VView.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) @@ -194,6 +194,5 @@ REGISTER_TYPE( VPostTreatmentAdjustmentTreatmentLog ) \ /* Disinfection */ \ REGISTER_TYPE( VDisinfectAdjustDisinfect ) \ - REGISTER_TYPE( VDisinfectAdjustChemicalConfirm ) \ //--------------------------------------------------------------------------------// Fisheye: Tag 719d1f34d076dba98ec80e7d9b3994a58d54d720 refers to a dead (removed) revision in file `sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 719d1f34d076dba98ec80e7d9b3994a58d54d720 refers to a dead (removed) revision in file `sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h'. Fisheye: No comparison available. Pass `N' to diff?