Index: leahi.pro
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- leahi.pro	(.../leahi.pro)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ leahi.pro	(.../leahi.pro)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -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 \
@@ -155,6 +157,8 @@
     sources/model/confirm/MDuetConfirmTDi.h \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \
     sources/model/dd/data/MDDBloodLeakData.h \
     sources/model/dd/data/MDDConcentratePumpData.h \
     sources/model/dd/data/MDDConductivityData.h \
@@ -179,7 +183,12 @@
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     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/MTreatmentAdjustIsolatedUFStateResponse.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 \
@@ -193,8 +202,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 \
@@ -261,8 +272,13 @@
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
+    sources/view/settings/VAdjustRoWaterMode.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
+    sources/view/settings/VRoWaterMode.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \
     sources/view/settings/VCalibrationSettings.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/data/VTDAirBubbleData.h \
@@ -277,10 +293,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 \
@@ -301,6 +320,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
@@ -353,20 +374,16 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
     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 \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -449,7 +466,6 @@
     sources/view/settings/VAdjustmentServiceMode.h \
     sources/view/settings/VAdjustmentServiceDates.h \
     sources/view/settings/VAdjustmentDGCleaningUsage.h \
-    sources/view/settings/VDuetRoWaterDG.h \
     sources/view/settings/VCloudSync.h \
     sources/view/settings/VHDUsageInfo.h \
     sources/view/settings/VAdjustmentInstitutionalRecord.h \
@@ -477,7 +493,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 \
@@ -528,6 +543,8 @@
     sources/model/confirm/MDuetConfirmTDi.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \
     sources/model/dd/data/MDDBloodLeakData.cpp \
     sources/model/dd/data/MDDConcentratePumpData.cpp \
     sources/model/dd/data/MDDConductivityData.cpp \
@@ -553,6 +570,10 @@
     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/MTreatmentAdjustIsolatedUFStateResponse.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 \
@@ -565,8 +586,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 \
@@ -650,20 +673,19 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmMapping.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
     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 \
     sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
@@ -676,8 +698,6 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
     \ # ---------- Models - DD - Adjustment - Settings
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -740,8 +760,13 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustRoWaterMode.cpp \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VRoWaterMode.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \
     sources/view/settings/VCalibrationSettings.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
@@ -756,10 +781,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 \
@@ -780,6 +808,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
@@ -812,7 +842,6 @@
     sources/view/settings/VAdjustmentAlarmVolume.cpp \
     sources/view/settings/VAdjustmentServiceMode.cpp \
     sources/view/settings/VAdjustmentServiceDates.cpp \
-    sources/view/settings/VDuetRoWaterDG.cpp \
     sources/view/settings/VCloudSync.cpp \
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
     sources/view/settings/VHDUsageInfo.cpp \
@@ -838,7 +867,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 \