Index: leahi.pro =================================================================== diff -u -r128121958d87699685bd88261e39bb968a0de204 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- leahi.pro (.../leahi.pro) (revision 128121958d87699685bd88261e39bb968a0de204) +++ leahi.pro (.../leahi.pro) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -170,10 +170,10 @@ sources/model/fp/data/MFPPressuresData.h \ sources/model/fp/data/MFPROPumpData.h \ sources/model/fp/data/MFPTemperatureData.h \ - sources/model/fp/data/MFPValvesStatesData.h \ 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/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ sources/model/td/data/MTDAirTrapData.h \ @@ -190,6 +190,7 @@ sources/model/td/data/treatment/MTreatmentStatesData.h \ sources/model/td/data/treatment/MTreatmentTimeData.h \ sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h \ + sources/model/td/data/treatment/MTreatmentVitalsData.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ sources/bluetooth/BluetoothInterface.h \ @@ -202,6 +203,10 @@ sources/device/DeviceModels.h \ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ + \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED sources/view/dd/data/VDDBloodLeakData.h \ sources/view/dd/data/VDDConcentratePumpData.h \ @@ -220,7 +225,6 @@ sources/view/fp/data/VFPPressuresData.h \ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/fp/data/VFPValvesStatesData.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ @@ -230,8 +234,13 @@ sources/view/td/data/VTDOpModeData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ + \ # ---------- Models - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \ + \ # ---------- Models - DD - Adjustment - Settings + sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -263,7 +272,6 @@ sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ @@ -280,9 +288,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment @@ -326,8 +331,6 @@ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ - \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ \ # ---------- Models - DG - Data - Disinfect - Progress @@ -377,6 +380,10 @@ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ + \ # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ sources/view/hd/alarm/VAlarmActiveList.h \ @@ -397,9 +404,6 @@ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -495,10 +499,10 @@ sources/model/fp/data/MFPPressuresData.cpp \ sources/model/fp/data/MFPROPumpData.cpp \ sources/model/fp/data/MFPTemperatureData.cpp \ - sources/model/fp/data/MFPValvesStatesData.cpp \ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -515,6 +519,7 @@ sources/model/td/data/treatment/MTreatmentStatesData.cpp \ sources/model/td/data/treatment/MTreatmentTimeData.cpp \ sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp \ + sources/model/td/data/treatment/MTreatmentVitalsData.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ @@ -535,7 +540,6 @@ sources/view/fp/data/VFPPressuresData.cpp \ sources/view/fp/data/VFPROPumpData.cpp \ sources/view/fp/data/VFPTemperatureData.cpp \ - sources/view/fp/data/VFPValvesStatesData.cpp \ sources/view/hd/data/post/VHDPOSTData.cpp \ sources/bluetooth/BluetoothInterface.cpp \ sources/cloudsync/CloudSyncController.cpp \ @@ -546,6 +550,10 @@ sources/device/DeviceModels.cpp \ \ # ---------- Models - TD - Data - States sources/model/td/data/MTDOpModeData.cpp \ + \ # ---------- Models - TD - Adjustment - In-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -573,10 +581,13 @@ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ + \ # ---------- Models - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ + \ # ---------- Models - DD - Adjustment - Settings + sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ @@ -591,9 +602,6 @@ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment @@ -633,7 +641,6 @@ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ @@ -673,6 +680,10 @@ sources/view/td/data/VTDOpModeData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -711,9 +722,6 @@ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment