Index: denali.pro =================================================================== diff -u -r5540e3a8ced92802b9c1576791185bc57b5edb48 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- denali.pro (.../denali.pro) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) +++ denali.pro (.../denali.pro) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -152,7 +152,6 @@ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/treatment/MTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ - sources/model/dg/data/disinfect/MDisinfectStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/MAdjustPowerOff.h \ @@ -342,7 +341,6 @@ sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ \ # ---------- Views - DG - Data - Disinfection - Progress \ # ---------- Views - DG - States - sources/view/dg/data/disinfect/VDisinfectStatesData.h \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGOperationModeData.h \ sources/view/dg/data/VDGDrainPumpData.h \ @@ -413,7 +411,6 @@ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/treatment/MTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ - sources/model/dg/data/disinfect/MDisinfectStatesData.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings @@ -596,7 +593,6 @@ sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \ \ # ---------- Views - DG - Data - Disinfect - Progress \ # ---------- Views - DG - States - sources/view/dg/data/disinfect/VDisinfectStatesData.cpp \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r5540e3a8ced92802b9c1576791185bc57b5edb48 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -85,7 +85,6 @@ {Gui::GuiActionType::ID_PreTreatmentStates , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DisinfectStates , 3 * 4 }, // 3 parameter each 4bytes // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r5540e3a8ced92802b9c1576791185bc57b5edb48 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -508,9 +508,6 @@ case Gui::GuiActionType::ID_TreatmentLogAvrgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAvrgeData ); break; 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; - - // ----- Disinfect - States - case Gui::GuiActionType::ID_DisinfectStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates ); break; // ----- Disinfection - Adjust case Gui::GuiActionType::ID_AdjustDisinfectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp ); break; // these need to be standard and use notify as well Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -50,7 +50,6 @@ #include "VPreTreatmentStatesData.h" #include "VHDTreatmentStatesData.h" #include "VPostTreatmentStatesData.h" -#include "VDisinfectStatesData.h" // Common treatment #include "VCommonAdjustmentVitals.h" // Pre-treatment Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r5540e3a8ced92802b9c1576791185bc57b5edb48 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -117,7 +117,6 @@ ID_PreTreatmentStates = 0x5C00, // 92 ID_TreatmentStates = 0x0F00, // 15 ID_PostTreatmentStates = 0x7700, // 119 - ID_DisinfectStates = 0x7E00, // 129 // DG message // ----- ID_PowerOff = 0x0100, Index: sources/gui/qml/main.qml =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/gui/qml/main.qml (.../main.qml) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/gui/qml/main.qml (.../main.qml) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -50,7 +50,6 @@ import VPreTreatmentStates 0.1 import VHDTreatmentStates 0.1 import VPostTreatmentStates 0.1 -import VDisinfectStates 0.1 // Treatment - Common import VTreatmentVitals 0.1 @@ -144,7 +143,6 @@ VPreTreatmentStates { id: vPreTreatmentStates } VHDTreatmentStates { id: vHDTreatmentStates } VPostTreatmentStates { id: vPostTreatmentStates } - VDisinfectStates { id: vDisinfectStates } VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals Index: sources/model/MModel.h =================================================================== diff -u -r5540e3a8ced92802b9c1576791185bc57b5edb48 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/model/MModel.h (.../MModel.h) (revision 5540e3a8ced92802b9c1576791185bc57b5edb48) +++ sources/model/MModel.h (.../MModel.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -42,7 +42,6 @@ #include "MPreTreatmentStatesData.h" #include "MTreatmentStatesData.h" #include "MPostTreatmentStatesData.h" -#include "MDisinfectStatesData.h" // HD Data Messages #include "MTreatmentTimeData.h" @@ -283,7 +282,6 @@ REGISTER_METATYPE( PreTreatmentStatesData ) \ REGISTER_METATYPE( TreatmentStatesData ) \ REGISTER_METATYPE( PostTreatmentStatesData ) \ - REGISTER_METATYPE( DisinfectStatesData ) \ REGISTER_METATYPE( BloodFlowData ) \ REGISTER_METATYPE( DialysateFlowData ) \ REGISTER_METATYPE( OutletFlowData ) \ @@ -453,7 +451,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PostTreatmentStatesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, OutletFlowData ) \ @@ -628,7 +625,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PostTreatmentStatesData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( OutletFlowData ) \ @@ -887,7 +883,6 @@ ACTION_RECEIVE_SIGNAL( PreTreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( PostTreatmentStatesData ) \ - ACTION_RECEIVE_SIGNAL( DisinfectStatesData ) \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ ACTION_RECEIVE_SIGNAL( OutletFlowData ) \ Fisheye: Tag ddc4d403774f54b87ad5518c3b4ad877e5fb3707 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ddc4d403774f54b87ad5518c3b4ad877e5fb3707 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VView.h =================================================================== diff -u -r719d1f34d076dba98ec80e7d9b3994a58d54d720 -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 --- sources/view/VView.h (.../VView.h) (revision 719d1f34d076dba98ec80e7d9b3994a58d54d720) +++ sources/view/VView.h (.../VView.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) @@ -128,7 +128,6 @@ REGISTER_TYPE( VPreTreatmentStates ) \ REGISTER_TYPE( VHDTreatmentStates ) \ REGISTER_TYPE( VPostTreatmentStates ) \ - REGISTER_TYPE( VDisinfectStates ) \ /* In-Treatment - Data */ \ REGISTER_TYPE( VTreatmentBloodFlow ) \ REGISTER_TYPE( VTreatmentDialysateFlow ) \ Fisheye: Tag ddc4d403774f54b87ad5518c3b4ad877e5fb3707 refers to a dead (removed) revision in file `sources/view/dg/data/disinfect/VDisinfectStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ddc4d403774f54b87ad5518c3b4ad877e5fb3707 refers to a dead (removed) revision in file `sources/view/dg/data/disinfect/VDisinfectStatesData.h'. Fisheye: No comparison available. Pass `N' to diff?