Index: denali.pro
===================================================================
diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5
--- denali.pro	(.../denali.pro)	(revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616)
+++ denali.pro	(.../denali.pro)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
@@ -34,133 +34,201 @@
     sources/gui \
     sources/canbus \
     sources/utility \
-    sources/abstract
+    sources/abstract \
+    sources/model/hd/adjustment \
+    sources/model/hd/alarm \
+    sources/model/hd/data \
+    sources/model/dg/data \
+    sources/view/dg/data
 
 HEADERS += \
+    \ # common
     common/AlarmDefs.h \
     common/DGDefs.h \
     common/HDDefs.h \
     common/MsgDefs.h \
+    \ # Main
     sources/main.h \
-    sources/maintimer.h \
-    sources/model/malarmcleared.h \
-    sources/model/malarmtriggered.h \
-    sources/model/mloadcellreadings.h \
-    sources/model/mtemperaturesensors.h \
-    sources/model/mtreatmentadjustblooddialysateresponse.h \
-    sources/model/mtreatmentadjustdurationresponse.h \
-    sources/model/mtreatmentadjustrequests.h \
-    sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h \
-    sources/model/mtreatmentadjustultrafiltrationstateresponse.h \
-    sources/model/mtreatmentadjustultrafiltrationeditresponse.h \
-    sources/model/mtreatmentpressureocclusion.h \
-    sources/model/mtreatmentranges.h \
-    sources/model/mtreatmentstate.h \
+    sources/model/MAbstract.h \
     sources/threads.h \
-    sources/applicationcontroller.h \
+    sources/maintimer.h \
     sources/applicationpost.h \
+    \ # Controllers
+    sources/applicationcontroller.h \
+    \ # ---------- Models ----------
+    sources/model/MModel.h \
+    sources/model/MPowerOff.h \
+    \ # ---------- Models - Alarm
+    sources/model/hd/alarm/MAlarmCleared.h \
+    sources/model/hd/alarm/MAlarmTriggered.h \
+    sources/model/hd/alarm/MAlarmStatusData.h \
+    \ # ---------- Models - HD - Adjustment - In-Treatment
+    sources/model/hd/adjustment/MTreatmentAdjustRequests.h \
+    sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
+    \ # ---------- Models - HD - Data
+    sources/model/hd/data/MTreatmentTimeData.h \
+    sources/model/hd/data/MTreatmentFlowsData.h \
+    sources/model/hd/data/MTreatmentOutletFlowData.h \
+    sources/model/hd/data/MTreatmentRangesData.h \
+    sources/model/hd/data/MTreatmentPressureOcclusionData.h \
+    sources/model/hd/data/MTreatmentStatesData.h \
+    \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDrainPumpData.h \
+    sources/model/dg/data/MDGHeatersData.h \
+    sources/model/dg/data/MDGLoadCellReadingsData.h \
+    sources/model/dg/data/MDGOperationModeData.h \
+    sources/model/dg/data/MDGPressuresData.h \
+    sources/model/dg/data/MDGReservoirData.h \
+    sources/model/dg/data/MDGROPumpData.h \
+    sources/model/dg/data/MDGTemperaturesData.h \
+    sources/model/dg/data/MDGValvesStatesData.h \
+    \ # CANBus
     sources/canbus/caninterface.h \
     sources/canbus/frameinterface.h \
+    \ # Denali Message
+    sources/canbus/messageglobals.h \
     sources/canbus/messageacknowmodel.h \
     sources/canbus/messagebuilder.h \
-    sources/canbus/messagedispatcher.h \
-    sources/canbus/messageglobals.h \
     sources/canbus/messageinterpreter.h \
-#    sources/configuration/display.h \
-#    sources/configuration/sound.h \
+    sources/canbus/messagedispatcher.h \
+    \ # Gui
     sources/gui/guiglobals.h \
     sources/gui/guiview.h \
     sources/gui/guicontroller.h \
-    sources/model/malarmstatus.h \
-    sources/model/mmodel.h \
-    sources/model/mpoweroff.h \
-    sources/model/mtreatmentflows.h \
-    sources/model/mtreatmentoutletflow.h \
-    sources/model/mtreatmenttime.h \
-    sources/view/vloadcellreadings.h \
-    sources/view/vtemperaturesensors.h \
-    sources/view/vtreatmentadjustmentduration.h \
-    sources/view/vtreatmentadjustmentflows.h \
-    sources/view/vtreatmentadjustmentresponsebase.h \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.h \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.h \
-    sources/view/vtreatmentpressureocclusion.h \
-    sources/view/vtreatmentranges.h \
+    \ # ---------- Views ----------
+    sources/view/dg/data/VDGDrainPumpData.h \
+    sources/view/dg/data/VDGHeatersData.h \
+    sources/view/dg/data/VDGLoadCellReadingsData.h \
+    sources/view/dg/data/VDGOperationModeData.h \
+    sources/view/dg/data/VDGPressuresData.h \
+    sources/view/dg/data/VDGROPumpData.h \
+    sources/view/dg/data/VDGReservoirData.h \
+    sources/view/dg/data/VDGTemperaturesData.h \
+    sources/view/dg/data/VDGValvesStatesData.h \
     sources/view/vview.h \
     sources/view/vpoweroff.h \
+    sources/view/valarmstatus.h \
+    \
+    sources/view/vtreatmenttime.h \
     sources/view/vtreatmentbloodflow.h \
     sources/view/vtreatmentdialysateflow.h \
-    sources/view/vtreatmenttime.h \
     sources/view/vtreatmentultrafiltration.h \
-    sources/view/valarmstatus.h \
-    sources/storage/filehandler.h \
-    sources/storage/logger.h \
+    sources/view/vtreatmentranges.h \
+    sources/view/vtreatmentpressureocclusion.h \
+    \
+    \
+    sources/view/vtreatmentadjustmentresponsebase.h \
+    sources/view/vtreatmentadjustmentduration.h \
+    sources/view/vtreatmentadjustmentflows.h \
+    sources/view/vtreatmentadjustmentultrafiltrationstate.h \
+    sources/view/vtreatmentadjustmentultrafiltrationedit.h \
+    sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \
+    \ # Storage
     sources/storage/storageglobals.h \
+    sources/storage/filehandler.h \
     sources/storage/usbwatcher.h \
-#    sources/storage/settings.h \
+    sources/storage/logger.h \
+    \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
     sources/utility/types.h
+#    sources/configuration/display.h \
+#    sources/configuration/sound.h \
+#    sources/storage/settings.h \
 
 SOURCES += \
+    \ # common
+    \ # Main
     main.cpp \
-    sources/maintimer.cpp \
-    sources/model/malarmcleared.cpp \
-    sources/model/malarmtriggered.cpp \
-    sources/model/mloadcellreadings.cpp \
-    sources/model/mtemperaturesensors.cpp \
-    sources/model/mtreatmentadjustblooddialysateresponse.cpp \
-    sources/model/mtreatmentadjustdurationresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationconfirmresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationeditresponse.cpp \
-    sources/model/mtreatmentpressureocclusion.cpp \
-    sources/model/mtreatmentranges.cpp \
-    sources/model/mtreatmentstate.cpp \
     sources/threads.cpp \
-    sources/applicationcontroller.cpp \
+    sources/maintimer.cpp \
     sources/applicationpost.cpp \
+    \ # Controllers
+    sources/applicationcontroller.cpp \
+    \ # ---------- Models ----------
+    sources/model/MPowerOff.cpp \
+    \ # ---------- Models - Alarm
+    sources/model/hd/alarm/MAlarmCleared.cpp \
+    sources/model/hd/alarm/MAlarmTriggered.cpp \
+    sources/model/hd/alarm/MAlarmStatusData.cpp \
+    \ # ---------- Models - HD - Adjustment - In-Treatment
+    sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+    \ # ---------- Models - HD - Data
+    sources/model/hd/data/MTreatmentTimeData.cpp \
+    sources/model/hd/data/MTreatmentFlowsData.cpp \
+    sources/model/hd/data/MTreatmentOutletFlowData.cpp \
+    sources/model/hd/data/MTreatmentRangesData.cpp \
+    sources/model/hd/data/MTreatmentPressureOcclusionData.cpp \
+    sources/model/hd/data/MTreatmentStatesData.cpp \
+    \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDrainPumpData.cpp \
+    sources/model/dg/data/MDGHeatersData.cpp \
+    sources/model/dg/data/MDGLoadCellReadingsData.cpp \
+    sources/model/dg/data/MDGOperationModeData.cpp \
+    sources/model/dg/data/MDGPressuresData.cpp \
+    sources/model/dg/data/MDGReservoirData.cpp \
+    sources/model/dg/data/MDGROPumpData.cpp \
+    sources/model/dg/data/MDGTemperaturesData.cpp \
+    sources/model/dg/data/MDGValvesStatesData.cpp \
+    \ # CANBus
     sources/canbus/caninterface.cpp \
     sources/canbus/frameinterface.cpp \
+    \ # Denali Message
     sources/canbus/messageacknowmodel.cpp \
     sources/canbus/messagebuilder.cpp \
     sources/canbus/messagedispatcher.cpp \
     sources/canbus/messageinterpreter.cpp \
-#    sources/configuration/display.cpp \
-#    sources/configuration/sound.cpp \
+    \ # Gui
     sources/gui/guiglobals.cpp \
     sources/gui/guiview.cpp \
     sources/gui/guicontroller.cpp \
-    sources/model/mpoweroff.cpp \
-    sources/model/mtreatmentflows.cpp \
-    sources/model/mtreatmentoutletflow.cpp \
-    sources/model/mtreatmenttime.cpp \
-    sources/model/malarmstatus.cpp \
-    sources/view/vloadcellreadings.cpp \
+    \ # ---------- Views ----------
+    sources/view/dg/data/VDGDrainPumpData.cpp \
+    sources/view/dg/data/VDGHeatersData.cpp \
+    sources/view/dg/data/VDGLoadCellReadingsData.cpp \
+    sources/view/dg/data/VDGOperationModeData.cpp \
+    sources/view/dg/data/VDGPressuresData.cpp \
+    sources/view/dg/data/VDGROPumpData.cpp \
+    sources/view/dg/data/VDGReservoirData.cpp \
+    sources/view/dg/data/VDGTemperaturesData.cpp \
+    sources/view/dg/data/VDGValvesStatesData.cpp \
     sources/view/vpoweroff.cpp \
-    sources/view/vtemperaturesensors.cpp \
-    sources/view/vtreatmentadjustmentduration.cpp \
-    sources/view/vtreatmentadjustmentflows.cpp \
-    sources/view/vtreatmentadjustmentresponsebase.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \
+    sources/view/valarmstatus.cpp \
+    \
+    sources/view/vtreatmenttime.cpp \
     sources/view/vtreatmentbloodflow.cpp \
     sources/view/vtreatmentdialysateflow.cpp \
-    sources/view/vtreatmentpressureocclusion.cpp \
-    sources/view/vtreatmentranges.cpp \
     sources/view/vtreatmentultrafiltration.cpp \
-    sources/view/vtreatmenttime.cpp \
-    sources/view/valarmstatus.cpp \
-    sources/storage/filehandler.cpp \
-    sources/storage/logger.cpp \
+    sources/view/vtreatmentranges.cpp \
+    sources/view/vtreatmentpressureocclusion.cpp \
+    \
+    \
+    sources/view/vtreatmentadjustmentresponsebase.cpp \
+    sources/view/vtreatmentadjustmentduration.cpp \
+    sources/view/vtreatmentadjustmentflows.cpp \
+    sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \
+    sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \
+    sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \
+    \ # Storage
     sources/storage/storageglobals.cpp \
+    sources/storage/filehandler.cpp \
     sources/storage/usbwatcher.cpp \
-#    sources/storage/settings.cpp \
+    sources/storage/logger.cpp \
+    \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
     sources/utility/types.cpp
+#    sources/configuration/display.cpp \
+#    sources/configuration/sound.cpp \
+#    sources/storage/settings.cpp \
 
 RESOURCES += \
     denali.qrc