Index: denali.pro =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- denali.pro (.../denali.pro) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ denali.pro (.../denali.pro) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -231,7 +231,6 @@ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ \ # ---------- Models - DG - Data - Disinfect - Progress - sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.h \ sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h \ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \ \ # ---------- Models - DG - Data @@ -346,7 +345,6 @@ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ \ # ---------- Views - DG - Data - Disinfection - Progress - sources/view/dg/data/disinfect/VDisinfectDGData.h \ \ # ---------- Views - DG - States sources/view/dg/data/disinfect/VDisinfectStatesData.h \ \ # ---------- Views - DG - Data @@ -491,7 +489,6 @@ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ \ # ---------- Models - DG - Data - Disinfection - Progress - sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.cpp \ sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp \ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \ \ # ---------- Models - DG - Data @@ -606,7 +603,6 @@ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \ \ # ---------- Views - DG - Data - Disinfect - Progress - sources/view/dg/data/disinfect/VDisinfectDGData.cpp \ \ # ---------- Views - DG - States sources/view/dg/data/disinfect/VDisinfectStatesData.cpp \ \ # ---------- Views - DG - Data Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -244,7 +244,6 @@ {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_DisinfectDGFlushTimeData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_DisinfectDGHeatTimeData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_DisinfectDGChemicalTimeData , 2 * 4 }, // 2 parameters each 4bytes // ---- Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 35db01154f90ebfdb6174033a66f5c20af82e14d) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -580,7 +580,6 @@ // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // ----- Datum - Disinfection - case Gui::GuiActionType::ID_DisinfectDGFlushTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushTimeData ); break; case Gui::GuiActionType::ID_DisinfectDGHeatTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData ); break; case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -115,7 +115,6 @@ #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" #include "VPostTreatmentAdjustTreatmentLog.h" // ----- Disinfection -#include "VDisinfectDGData.h" #include "VDisinfectAdjustDisinfect.h" #include "VDisinfectAdjustChemicalConfirm.h" // ----- Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -267,7 +267,6 @@ ID_AdjustDisinfectRsp = 0x8000, // 128 ID_AdjustChemicalConfirmReq = 0x8100, // 129 ID_AdjustChemicalConfirmRsp = 0x8200, // 130 - ID_DisinfectDGFlushTimeData = 0x8300, // 131 ID_DisinfectDGHeatTimeData = 0x8400, // 132 ID_DisinfectDGChemicalTimeData = 0x8500, // 133 }; Index: sources/gui/qml/main.qml =================================================================== diff -u -r153bcdb67dca6c40022318b80d5c7079d48bb37f -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/gui/qml/main.qml (.../main.qml) (revision 153bcdb67dca6c40022318b80d5c7079d48bb37f) +++ sources/gui/qml/main.qml (.../main.qml) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -111,7 +111,6 @@ // Disinfection import VDisinfectAdjustDisinfect 0.1 import VDisinfectAdjustChemicalConfirm 0.1 -import VDisinfectDGData 0.1 // Qml imports import "qrc:/globals" @@ -219,7 +218,6 @@ // --- Disinfection VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } VDisinfectAdjustChemicalConfirm { id: vDisinfectAdjustChemicalConfirm } - VDisinfectDGData { id: vDisinfectDGData } Background {} Index: sources/model/MModel.h =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/model/MModel.h (.../MModel.h) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ sources/model/MModel.h (.../MModel.h) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -139,7 +139,6 @@ #include "MDisinfectAdjustRequests.h" #include "MDisinfectAdjustResponse.h" #include "MDisinfectAdjustChemicalConfirmResponse.h" -#include "MDisinfectDGFlushTimeData.h" #include "MDisinfectDGHeatTimeData.h" #include "MDisinfectDGChemicalTimeData.h" @@ -339,7 +338,6 @@ REGISTER_METATYPE( PreTreatmentSelfTestDryData ) \ REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ /* Disinfection */ \ - REGISTER_METATYPE( DisinfectDGFlushTimeData ) \ REGISTER_METATYPE( DisinfectDGHeatTimeData ) \ REGISTER_METATYPE( DisinfectDGChemicalTimeData ) \ \ @@ -516,7 +514,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablesPrimeData ) \ /* Disinfection */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGFlushTimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGHeatTimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGChemicalTimeData ) \ /* Response */ \ @@ -697,7 +694,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablesPrimeData ) \ /* Disinfection */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGFlushTimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGHeatTimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGChemicalTimeData ) \ /* Response */ \ @@ -963,7 +959,6 @@ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablesPrimeData ) \ /* Disinfection */ \ - ACTION_RECEIVE_SIGNAL( DisinfectDGFlushTimeData ) \ ACTION_RECEIVE_SIGNAL( DisinfectDGHeatTimeData ) \ ACTION_RECEIVE_SIGNAL( DisinfectDGChemicalTimeData ) \ /* Response */ \ Fisheye: Tag f1bc4aa93887970b32b81f0c65d8889a662fa390 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f1bc4aa93887970b32b81f0c65d8889a662fa390 refers to a dead (removed) revision in file `sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VView.h =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -rf1bc4aa93887970b32b81f0c65d8889a662fa390 --- sources/view/VView.h (.../VView.h) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ sources/view/VView.h (.../VView.h) (revision f1bc4aa93887970b32b81f0c65d8889a662fa390) @@ -193,7 +193,6 @@ REGISTER_TYPE( VPostTreatmentAdjustmentDisposablesRemovalConfirm ) \ REGISTER_TYPE( VPostTreatmentAdjustmentTreatmentLog ) \ /* Disinfection */ \ - REGISTER_TYPE( VDisinfectDGData ) \ REGISTER_TYPE( VDisinfectAdjustDisinfect ) \ REGISTER_TYPE( VDisinfectAdjustChemicalConfirm ) \ Fisheye: Tag f1bc4aa93887970b32b81f0c65d8889a662fa390 refers to a dead (removed) revision in file `sources/view/dg/data/disinfect/VDisinfectDGData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f1bc4aa93887970b32b81f0c65d8889a662fa390 refers to a dead (removed) revision in file `sources/view/dg/data/disinfect/VDisinfectDGData.h'. Fisheye: No comparison available. Pass `N' to diff?