Index: leahi.pro =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rf2e4eba6e85c5d36537be782926f23cc9dc01037 --- leahi.pro (.../leahi.pro) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ leahi.pro (.../leahi.pro) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) @@ -55,14 +55,23 @@ sources \ sources/device \ sources/storage \ - sources/gui \ sources/canbus \ + sources/model \ + sources/model/td \ + sources/model/td/data \ + sources/model/td/alarm \ + sources/view \ + sources/view/td \ + sources/view/td/data \ + sources/view/confirm \ + sources/view/settings \ + \ + sources/gui \ sources/utility \ sources/wifi \ sources/bluetooth \ sources/cloudsync \ sources/abstract \ - sources/model \ sources/model/confirm \ sources/model/settings \ sources/model/ui/data \ @@ -85,9 +94,6 @@ sources/model/dg/data/disinfect \ sources/model/dg/adjustment \ sources/model/dg/adjustment/settings \ - sources/view \ - sources/view/confirm \ - sources/view/settings \ sources/view/pretreatment \ sources/view/ui/data \ sources/view/hd/adjustment/common \ @@ -134,6 +140,10 @@ sources/model/MAbstract.h \ sources/model/MAbstractDynamic.h \ sources/device/DeviceModels.h \ + \ # ---------- Models - TD - Data //// ----- @LEAHIZED + sources/model/td/data/MTDOpModeData.h \ + \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED + sources/view/td/data/VTDOpModeData.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -160,7 +170,6 @@ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/treatment/MTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ @@ -335,7 +344,6 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/treatment/VHDTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ @@ -411,6 +419,8 @@ sources/model/MAbstract.cpp \ sources/model/MAbstractDynamic.cpp \ sources/device/DeviceModels.cpp \ + \ # ---------- Models - TD - Data - States + sources/model/td/data/MTDOpModeData.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -436,7 +446,6 @@ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/treatment/MTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ @@ -546,6 +555,8 @@ sources/view/VEventSpy.cpp \ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ + \ # ---------- Views - TD - States Data + sources/view/td/data/VTDOpModeData.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -601,7 +612,6 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \