Index: leahi.pro =================================================================== diff -u -rbae1ae230d8b41f90b1fcd34b9bccdfa87bf3cd9 -rc1e50347c78096b626b2cd1ef32a33b439e88bdd --- leahi.pro (.../leahi.pro) (revision bae1ae230d8b41f90b1fcd34b9bccdfa87bf3cd9) +++ leahi.pro (.../leahi.pro) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) @@ -171,10 +171,11 @@ 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/MAdjustTDAdvancedInstitutionalRecordResponse.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/settings/MTDAdvancedInstitutionalRecordResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ @@ -209,9 +210,19 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.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 \ @@ -230,19 +241,41 @@ 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/settings/VAdjustmentAdvancedInstitutionalRecord.h \ + sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ sources/view/td/data/VTDBatteryData.h \ sources/view/td/data/VTDEjectorData.h \ sources/view/td/data/VTDOpModeData.h \ + sources/view/td/data/VTreatmentRanges.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/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 - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \ + sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h \ + sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h \ + \ # ---------- Models - DD - Adjustment - Settings + sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ + \ # ---------- Models - TD - Adjustment - End-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -259,7 +292,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ @@ -274,7 +306,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 \ @@ -289,14 +320,11 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment 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/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 \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \ \ # ---------- Models - HD - Adjustment - Post-Treatment sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \ @@ -332,8 +360,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 @@ -383,10 +409,7 @@ 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 \ + sources/view/settings/VInstitutionalRecord.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ sources/view/hd/alarm/VAlarmActiveList.h \ @@ -405,10 +428,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/VTreatmentAdjustmentDuration.h \ - 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 \ @@ -503,11 +523,11 @@ 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/MAdjustTDAdvancedInstitutionalRecordResponse.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/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -545,7 +565,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 \ @@ -560,9 +579,21 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.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 \ + \ # ---------- Models - TD - Adjustment - End-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -577,7 +608,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ @@ -588,12 +618,15 @@ \ # ---------- 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 - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ + sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.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 \ @@ -606,14 +639,11 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp \ 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 \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Adjustment - Post-Treatment sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \ @@ -645,7 +675,6 @@ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.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 \ @@ -677,18 +706,30 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data + sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ + sources/view/settings/VAdvancedInstitutionalRecord.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ sources/view/td/data/VTDBatteryData.cpp \ sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ + sources/view/td/data/VTreatmentRanges.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/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 @@ -710,6 +751,7 @@ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ sources/view/settings/VAdjustmentInstitutionalRecord.cpp \ + sources/view/settings/VInstitutionalRecord.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - common @@ -725,10 +767,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/VTreatmentAdjustmentDuration.cpp \ - 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 \ @@ -751,7 +790,6 @@ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment - sources/view/hd/data/VTreatmentRanges.cpp \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ \ # ---------- Views - HD - Data - End-Treatment