Index: denali.pro
===================================================================
diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b
--- denali.pro	(.../denali.pro)	(revision 604a782b50c9fc749c3bd71485e285c1070f1e01)
+++ denali.pro	(.../denali.pro)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
@@ -52,12 +52,6 @@
     common/MsgDefs.h \
     \ # Main
     sources/main.h \
-    sources/model/MTreatmentParameters.h \
-    sources/model/MTreatmentParametersResp.h \
-    sources/storage/filesaver.h \
-    sources/model/MDGDebugText.h \
-    sources/model/MHDDebugText.h \
-    sources/storage/DriveWatcher.h \
     sources/Threads.h \
     sources/MainTimer.h \
     sources/ApplicationPost.h \
@@ -67,6 +61,11 @@
     sources/model/MModel.h \
     sources/model/MAbstract.h \
     sources/model/MPowerOff.h \
+    sources/model/MEndTreatmentResponse.h \
+    sources/model/MStartTreatmentResponse.h \
+    sources/model/MTreatmentParametersResp.h \
+    sources/model/MDGDebugText.h \
+    sources/model/MHDDebugText.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
@@ -89,6 +88,7 @@
     sources/model/hd/data/MTreatmentStatesData.h \
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/MTreatmentSalineData.h \
+    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
@@ -113,10 +113,13 @@
     sources/gui/GuiView.h \
     sources/gui/GuiController.h \
     \ # ---------- Views ----------
-    sources/view/VCreateTreatment.h \
+    sources/view/VTreatmentCreate.h \
+    sources/view/VTreatmentEnd.h \
+    sources/view/VTreatmentBegin.h \
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
+    sources/view/VPriming.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
@@ -152,6 +155,8 @@
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
     sources/storage/FileHandler.h \
+    sources/storage/FileSaver.h \
+    sources/storage/DriveWatcher.h \
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
@@ -164,8 +169,6 @@
     \ # common
     \ # Main
     main.cpp \
-    sources/model/MTreatmentParameters.cpp \
-    sources/model/MTreatmentParametersResp.cpp \
     sources/Threads.cpp \
     sources/MainTimer.cpp \
     sources/ApplicationPost.cpp \
@@ -174,6 +177,11 @@
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     sources/model/MPowerOff.cpp \
+    sources/model/MHDDebugText.cpp \
+    sources/model/MEndTreatmentResponse.cpp \
+    sources/model/MStartTreatmentResponse.cpp \
+    sources/model/MTreatmentParametersResp.cpp \
+    sources/model/MDGDebugText.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
@@ -187,7 +195,6 @@
     sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \
     \ # ---------- Models - HD - Data
-    sources/model/MHDDebugText.cpp \
     sources/model/hd/data/MTreatmentTimeData.cpp \
     sources/model/hd/data/MTreatmentFlowsData.cpp \
     sources/model/hd/data/MTreatmentOutletFlowData.cpp \
@@ -196,8 +203,8 @@
     sources/model/hd/data/MTreatmentStatesData.cpp \
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MTreatmentSalineData.cpp \
+    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Data
-    sources/model/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
@@ -220,9 +227,12 @@
     sources/gui/GuiView.cpp \
     sources/gui/GuiController.cpp \
     \ # ---------- Views ----------
+    sources/view/VTreatmentCreate.cpp \
+    sources/view/VTreatmentEnd.cpp \
+    sources/view/VTreatmentBegin.cpp \
     sources/view/VEventSpy.cpp \
+    sources/view/VPriming.cpp \
     sources/view/VPowerOff.cpp \
-    sources/view/VCreateTreatment.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
@@ -259,7 +269,7 @@
     sources/storage/FileHandler.cpp \
     sources/storage/Logger.cpp \
     sources/storage/DriveWatcher.cpp \
-    sources/storage/filesaver.cpp \
+    sources/storage/FileSaver.cpp \
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
@@ -404,7 +414,7 @@
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
+else: unix:!android: target.path = /home/root
 !isEmpty(target.path): INSTALLS += target
 
 DISTFILES += \