Index: leahi.pro =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- leahi.pro (.../leahi.pro) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ leahi.pro (.../leahi.pro) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -65,6 +65,7 @@ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ sources/model/td/adjustment/treatment \ + sources/model/td/adjustment/pretreatment \ sources/model/dd \ sources/model/dd/data \ sources/model/dd/adjustment \ @@ -78,6 +79,7 @@ sources/view/td/data \ sources/view/td/data/treatment \ sources/view/td/adjustment/treatment \ + sources/view/td/adjustment/pretreatment \ sources/view/dd \ sources/view/dd/data \ sources/view/confirm \ @@ -187,6 +189,8 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ + sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ sources/model/td/data/treatment/MTreatmentSalineData.h \ @@ -216,6 +220,9 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h \ @@ -241,7 +248,6 @@ sources/view/fp/data/VFPPressuresData.h \ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/hd/data/VTreatmentRanges.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/td/data/VTDAirBubbleData.h \ @@ -250,7 +256,22 @@ sources/view/td/data/VTDBatteryData.h \ sources/view/td/data/VTDEjectorData.h \ sources/view/td/data/VTDOpModeData.h \ + sources/view/td/data/VTDSwitchesData.h \ + sources/view/td/data/VTDTemperatureData.h \ + sources/view/td/data/VTDValvesData.h \ + sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.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/VTreatmentIsolatedUFData.h \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ + sources/view/td/data/treatment/VTreatmentSalineData.h \ + sources/view/td/data/treatment/VTreatmentTime.h \ + sources/view/td/data/treatment/VTreatmentTrends.h \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ @@ -259,13 +280,19 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h \ + 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/VTreatmentAdjustmentPressuresLimits.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \ + \ # ---------- Views - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - TD - Adjustment - Settings @@ -276,6 +303,9 @@ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - TD - Adjustment - End-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -312,12 +342,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ @@ -351,7 +379,6 @@ sources/model/hd/data/treatment/MTreatmentHeparinData.h \ sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ sources/model/hd/data/treatment/MTreatmentStopData.h \ sources/model/hd/data/post/MHDRTCEpochData.h \ sources/model/hd/data/MHDUsageInfoResponse.h \ @@ -421,12 +448,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -455,7 +480,6 @@ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \ sources/view/hd/data/treatment/VTreatmentStopData.h \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ @@ -477,19 +501,7 @@ sources/utility/format.h \ sources/utility/types.h \ sources/utility/encryption.h \ - sources/utility/qrcodegen.h \ - sources/view/td/data/VTDSwitchesData.h \ - sources/view/td/data/VTDTemperatureData.h \ - sources/view/td/data/VTDValvesData.h \ - sources/view/td/data/VTDVoltageData.h \ - sources/view/td/data/treatment/VTDTreatmentStatesData.h \ - sources/view/td/data/treatment/VTreatmentBloodFlow.h \ - sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ - sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ - sources/view/td/data/treatment/VTreatmentSalineData.h \ - sources/view/td/data/treatment/VTreatmentTime.h \ - sources/view/td/data/treatment/VTreatmentTrends.h \ - sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h + sources/utility/qrcodegen.h SOURCES += \ \ # common @@ -538,6 +550,8 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ + sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ sources/model/td/data/treatment/MTreatmentSalineData.cpp \ @@ -585,6 +599,9 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp \ @@ -622,6 +639,9 @@ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment @@ -632,12 +652,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ @@ -663,7 +681,6 @@ sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/treatment/MTreatmentStopData.cpp \ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ @@ -714,7 +731,22 @@ sources/view/td/data/VTDBatteryData.cpp \ sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ + sources/view/td/data/VTDSwitchesData.cpp \ + sources/view/td/data/VTDTemperatureData.cpp \ + sources/view/td/data/VTDValvesData.cpp \ + sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.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/VTreatmentIsolatedUFData.cpp \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ + sources/view/td/data/treatment/VTreatmentSalineData.cpp \ + sources/view/td/data/treatment/VTreatmentTime.cpp \ + sources/view/td/data/treatment/VTreatmentTrends.cpp \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ @@ -723,13 +755,19 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ + 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/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \ + \ # ---------- Views - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -760,12 +798,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -793,7 +829,6 @@ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ \ # ---------- Views - HD - Data - End-Treatment - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \ sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \ sources/view/hd/data/treatment/VTreatmentStopData.cpp \ @@ -817,19 +852,7 @@ sources/utility/format.cpp \ sources/utility/types.cpp \ sources/utility/encryption.cpp \ - sources/utility/qrcodegen.cpp \ - sources/view/td/data/VTDSwitchesData.cpp \ - sources/view/td/data/VTDTemperatureData.cpp \ - sources/view/td/data/VTDValvesData.cpp \ - sources/view/td/data/VTDVoltageData.cpp \ - sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ - sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ - sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ - sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ - sources/view/td/data/treatment/VTreatmentSalineData.cpp \ - sources/view/td/data/treatment/VTreatmentTime.cpp \ - sources/view/td/data/treatment/VTreatmentTrends.cpp \ - sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp + sources/utility/qrcodegen.cpp RESOURCES += \ leahi.qrc