Index: leahi.pro
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677
--- leahi.pro	(.../leahi.pro)	(revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ leahi.pro	(.../leahi.pro)	(revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677)
@@ -61,6 +61,7 @@
     sources/model/td/data \
     sources/model/td/data/treatment \
     sources/model/td/data/treatmentlog \
+    sources/model/td/data/pretreatment \
     sources/model/td/alarm \
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
@@ -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 \
@@ -183,6 +185,9 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -196,8 +201,10 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/MWaterSampleData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
+    sources/model/td/data/treatment/MTreatmentHDFData.h \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \
@@ -268,6 +275,10 @@
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
     sources/view/settings/VRoWaterMode.h \
+    sources/view/settings/VCalibrationSettings.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/data/VTDAirBubbleData.h \
     sources/view/td/data/VTDAirPumpData.h \
@@ -281,10 +292,13 @@
     sources/view/td/data/VTDVoltageData.h \
     sources/view/td/data/VTreatmentRanges.h \
     sources/view/td/data/VWaterSampleData.h \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \
+    sources/view/td/data/treatment/VTreatmentHDFData.h \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \
@@ -363,7 +377,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 \
@@ -477,7 +490,6 @@
     \ # ---------- 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 \
@@ -555,6 +567,9 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
@@ -567,8 +582,10 @@
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
+    sources/model/td/data/treatment/MTreatmentHDFData.cpp \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \
@@ -659,7 +676,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 \
@@ -744,6 +760,10 @@
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VRoWaterMode.cpp \
+    sources/view/settings/VCalibrationSettings.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
     sources/view/td/data/VTDAirPumpData.cpp \
@@ -757,10 +777,13 @@
     sources/view/td/data/VTDVoltageData.cpp \
     sources/view/td/data/VTreatmentRanges.cpp \
     sources/view/td/data/VWaterSampleData.cpp \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
+    sources/view/td/data/treatment/VTreatmentHDFData.cpp \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
@@ -838,7 +861,6 @@
     \ # ---------- 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 \