Index: leahi.pro =================================================================== diff -u -rc7767b9f771f798feb3167c47d27e36b247bb858 -rcb9c48c7c307690dcafcfd16ef412fe660291692 --- leahi.pro (.../leahi.pro) (revision c7767b9f771f798feb3167c47d27e36b247bb858) +++ leahi.pro (.../leahi.pro) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) @@ -68,6 +68,10 @@ sources/model/dd/data \ sources/model/dd/adjustment \ sources/model/dd/adjustment/settings \ + sources/model/fp \ + sources/model/fp/data \ + sources/model/fp/adjustment \ + sources/model/fp/adjustment/settings \ sources/view \ sources/view/td \ sources/view/td/data \ @@ -77,6 +81,8 @@ sources/view/dd/data \ sources/view/confirm \ sources/view/settings \ + sources/view/fp \ + sources/view/fp/data \ \ sources/gui \ sources/utility \ @@ -130,6 +136,7 @@ common/AlarmDefs.h \ common/Compatible.h \ common/DDDefs.h \ + common/FPDefs.h \ common/TDDefs.h \ common/MsgDefs.h \ \ # Main @@ -155,9 +162,19 @@ sources/model/dd/data/MDDPressuresData.h \ sources/model/dd/data/MDDTemperaturesData.h \ sources/model/dd/data/MDDValvesStatesData.h \ + sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h \ + sources/model/fp/data/MFPBoostPumpData.h \ + sources/model/fp/data/MFPConductivityData.h \ + sources/model/fp/data/MFPFlowData.h \ + sources/model/fp/data/MFPLevelData.h \ + 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 \ @@ -174,6 +191,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 \ @@ -182,6 +200,7 @@ sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MAbstractDynamic.h \ + sources/model/MListModel.h \ sources/device/DeviceModels.h \ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ @@ -200,13 +219,26 @@ sources/view/dd/data/VDDPressuresData.h \ sources/view/dd/data/VDDTemperaturesData.h \ sources/view/dd/data/VDDValvesStatesData.h \ + sources/view/fp/data/VFPBoostPumpData.h \ + sources/view/fp/data/VFPConductivityData.h \ + sources/view/fp/data/VFPFlowData.h \ + sources/view/fp/data/VFPLevelData.h \ + 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 \ sources/view/td/data/VTDAirTrapData.h \ sources/view/td/data/VTDBatteryData.h \ sources/view/td/data/VTDEjectorData.h \ 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 - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -255,7 +287,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/MTreatmentAdjustSalineResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment @@ -374,7 +405,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/VTreatmentAdjustmentSaline.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -462,9 +492,19 @@ sources/model/dd/data/MDDPressuresData.cpp \ sources/model/dd/data/MDDTemperaturesData.cpp \ sources/model/dd/data/MDDValvesStatesData.cpp \ + sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp \ + sources/model/fp/data/MFPBoostPumpData.cpp \ + sources/model/fp/data/MFPConductivityData.cpp \ + sources/model/fp/data/MFPFlowData.cpp \ + sources/model/fp/data/MFPLevelData.cpp \ + 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 \ @@ -481,6 +521,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 \ @@ -494,12 +535,21 @@ sources/view/dd/data/VDDPressuresData.cpp \ sources/view/dd/data/VDDTemperaturesData.cpp \ sources/view/dd/data/VDDValvesStatesData.cpp \ + sources/view/fp/data/VFPBoostPumpData.cpp \ + sources/view/fp/data/VFPConductivityData.cpp \ + sources/view/fp/data/VFPFlowData.cpp \ + sources/view/fp/data/VFPLevelData.cpp \ + 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 \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ sources/model/MAbstractDynamic.cpp \ + sources/model/MListModel.cpp \ sources/device/DeviceModels.cpp \ \ # ---------- Models - TD - Data - States sources/model/td/data/MTDOpModeData.cpp \ @@ -532,6 +582,8 @@ \ # ---------- 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 @@ -550,7 +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/MTreatmentAdjustSalineResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment @@ -629,6 +680,8 @@ sources/view/td/data/VTDEjectorData.cpp \ 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 \ @@ -670,7 +723,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/VTreatmentAdjustmentSaline.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment