Index: leahi.pro =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -r16aaf5ab7e1c58199754a132d624a470295d3440 --- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ leahi.pro (.../leahi.pro) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -155,6 +155,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 +181,13 @@ 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/MTreatmentAdjustAutoSubResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ @@ -195,6 +203,8 @@ sources/model/td/data/MWaterSampleData.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/MTreatmentDryBicartDisconnectData.h \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -217,6 +227,7 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ sources/model/td/data/MTDPowerOffWarning.h \ + sources/model/td/data/MTDSyringePumpData.h \ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ @@ -263,7 +274,12 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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/VTreatmentAdjustmentDryBicartDisconnect.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -276,10 +292,13 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + sources/view/td/data/VTDSyringePumpData.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/VTreatmentDryBicartDisconnect.h \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -300,6 +319,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 \ @@ -352,7 +373,6 @@ 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 \ @@ -364,8 +384,6 @@ \ # ---------- 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 \ @@ -391,7 +409,6 @@ sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -448,7 +465,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 \ @@ -485,7 +501,6 @@ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -527,6 +542,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 \ @@ -552,6 +569,11 @@ 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/MTreatmentAdjustDryBicartDisconnectResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ @@ -564,8 +586,11 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/MTDSyringePumpData.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/MTreatmentDryBicartDisconnectData.cpp \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -649,7 +674,6 @@ 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 \ @@ -663,6 +687,7 @@ 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 \ @@ -675,8 +700,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 \ @@ -694,7 +717,6 @@ sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -741,7 +763,12 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.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/VTreatmentAdjustmentDryBicartDisconnect.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ @@ -754,10 +781,13 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + sources/view/td/data/VTDSyringePumpData.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/VTreatmentDryBicartDisconnect.cpp \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ @@ -778,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 \ @@ -810,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 \ @@ -840,7 +871,6 @@ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \