Index: leahi.pro =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- leahi.pro (.../leahi.pro) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ leahi.pro (.../leahi.pro) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -174,10 +174,6 @@ 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/MTreatmentAdjustBolusVolumeResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.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 \ @@ -208,9 +204,19 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED + sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h \ + 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/MTreatmentAdjustPressuresLimitsResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED sources/view/dd/data/VDDBloodLeakData.h \ sources/view/dd/data/VDDConcentratePumpData.h \ @@ -238,13 +244,20 @@ sources/view/td/data/VTDEjectorData.h \ sources/view/td/data/VTDOpModeData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.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 \ - \ # ---------- Models - TD - Adjustment - In-Treatment - sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -293,7 +306,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \ @@ -386,10 +398,6 @@ 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 \ @@ -408,9 +416,7 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Adjustment - End-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \ @@ -508,10 +514,6 @@ 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/MTreatmentAdjustBolusVolumeResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.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 \ @@ -561,9 +563,19 @@ \ # ---------- 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/MTreatmentAdjustBloodFlowRateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp \ + 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/MTreatmentAdjustPressuresLimitsResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -589,8 +601,6 @@ \ # ---------- Models - Data - States sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ - \ # ---------- Models - TD - Adjustment - In-Treatment - sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings @@ -609,7 +619,6 @@ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ @@ -686,14 +695,20 @@ sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.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 - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -730,9 +745,7 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \