Index: leahi.pro
===================================================================
diff -u -rdf61c476838011a343a6930fd5b30404629379bc -re68c1cc0f53b3c03943af4b70c46b5954603b53a
--- leahi.pro	(.../leahi.pro)	(revision df61c476838011a343a6930fd5b30404629379bc)
+++ leahi.pro	(.../leahi.pro)	(revision e68c1cc0f53b3c03943af4b70c46b5954603b53a)
@@ -60,6 +60,7 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/pretreatment \
     sources/model/td/data/treatmentlog \
     sources/model/td/alarm \
     sources/model/td/adjustment \
@@ -79,6 +80,7 @@
     sources/view/td \
     sources/view/td/data \
     sources/view/td/data/treatment \
+    sources/view/td/data/pretreatment \
     sources/view/td/adjustment/treatment \
     sources/view/td/adjustment/pretreatment \
     sources/view/td/adjustment/posttreatment \
@@ -229,6 +231,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \
+    \ # ---------- Models - TD - Data - Pre-Treatment
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
@@ -289,6 +294,9 @@
     sources/view/td/data/VTreatmentRanges.h \
     sources/view/td/data/VWaterSampleData.h \
     sources/view/td/data/VTDSyringePumpData.h \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
+    sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -328,7 +336,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
-    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \    
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
@@ -376,7 +384,6 @@
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmActiveList.h \
     \ # ---------- Models - States Data
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
@@ -403,7 +410,6 @@
     \ # ---------- Models - HD - Data - Pre-Treatment - Progress
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \
-    sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDDebugText.h \
     sources/model/hd/data/MHDGeneralEvent.h \
@@ -492,12 +498,10 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \
-    sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/post/VHDPOSTData.h \
     sources/view/hd/data/VHDAccelerometerData.h \
@@ -638,6 +642,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
+    \ # ---------- Models - Data - States
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -680,7 +687,6 @@
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmActiveList.cpp \
     \ # ---------- Models - Data - States
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
     \ # ---------- Models - TD - Adjustment - Settings
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
@@ -727,7 +733,6 @@
     sources/model/hd/data/post/MHDRTCEpochData.cpp \
     sources/model/hd/data/MHDUsageInfoResponse.cpp \
     \ # ---------- Models - HD - Data - Pre-Treatment
-    sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \
     \ # ---------- Models - DG - Adjustment - Settings
@@ -781,6 +786,9 @@
     sources/view/td/data/VTreatmentRanges.cpp \
     sources/view/td/data/VWaterSampleData.cpp \
     sources/view/td/data/VTDSyringePumpData.cpp \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
+    sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -820,7 +828,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
-    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \    
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
@@ -867,15 +875,13 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
     sources/view/hd/data/VHDBloodLeakData.cpp \
     \ # ---------- Views - HD - Data - Pre-Treatment
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
-    sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - HD - Data - In-Treatment
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \