Index: leahi.pro =================================================================== diff -u -rb3f0f9afa498c5892f39745c36b9762ec957a468 -r66ed4277f1a2219554e1920f3701c1eb438e9a0a --- leahi.pro (.../leahi.pro) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) +++ leahi.pro (.../leahi.pro) (revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a) @@ -143,11 +143,21 @@ sources/device/DeviceController.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/data/MDDBloodLeakData.h \ + sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ + sources/model/dd/data/MDDDialysatePumpData.h \ sources/model/dd/data/MDDGenDialysateData.h \ + sources/model/dd/data/MDDHeatersData.h \ + sources/model/dd/data/MDDLevelData.h \ + sources/model/dd/data/MDDPressuresData.h \ + sources/model/dd/data/MDDTemperaturesData.h \ + sources/model/dd/data/MDDValvesStatesData.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/data/MTDAirBubbleData.h \ + sources/model/td/data/MTDAirPumpData.h \ sources/model/td/data/MTDAirTrapData.h \ sources/model/td/data/MTDBatteryData.h \ sources/model/td/data/MTDEjectorData.h \ @@ -170,13 +180,24 @@ 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 \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED + sources/view/dd/data/VDDBloodLeakData.h \ + sources/view/dd/data/VDDConcentratePumpData.h \ sources/view/dd/data/VDDConductivityData.h \ + sources/view/dd/data/VDDDialysatePumpData.h \ sources/view/dd/data/VDDGenDialysateData.h \ + sources/view/dd/data/VDDHeatersData.h \ + sources/view/dd/data/VDDLevelData.h \ + sources/view/dd/data/VDDPressuresData.h \ + sources/view/dd/data/VDDTemperaturesData.h \ + sources/view/dd/data/VDDValvesStatesData.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 \ @@ -258,7 +279,6 @@ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MHDSyringePumpData.h \ - sources/model/hd/data/MHDAirBubbleData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -286,16 +306,11 @@ sources/model/dg/data/MDGDebugText.h \ sources/model/dg/data/MDGGeneralEvent.h \ sources/model/dg/data/MDGDrainPumpData.h \ - sources/model/dg/data/MDGHeatersData.h \ sources/model/dg/data/MDGLoadCellReadingsData.h \ sources/model/dg/data/MDGOperationModeData.h \ - sources/model/dg/data/MDGPressuresData.h \ sources/model/dg/data/MDGReservoirData.h \ sources/model/dg/data/MDGROPumpData.h \ - sources/model/dg/data/MDGTemperaturesData.h \ - sources/model/dg/data/MDGValvesStatesData.h \ sources/model/dg/data/MDGAccelerometerData.h \ - sources/model/dg/data/MDDLevelData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ @@ -380,7 +395,6 @@ sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VHDSyringePumpData.h \ - sources/view/hd/data/VHDAirBubbleData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -395,15 +409,10 @@ \ # ---------- Views - DG - Data sources/view/dg/data/VDGOperationModeData.h \ sources/view/dg/data/VDGDrainPumpData.h \ - sources/view/dg/data/VDGHeatersData.h \ sources/view/dg/data/VDGLoadCellReadingsData.h \ - sources/view/dg/data/VDGPressuresData.h \ sources/view/dg/data/VDGROPumpData.h \ sources/view/dg/data/VDGReservoirData.h \ - sources/view/dg/data/VDGTemperaturesData.h \ - sources/view/dg/data/VDGValvesStatesData.h \ sources/view/dg/data/VDGAccelerometerData.h \ - sources/view/dg/data/VDDLevelData.h \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -440,11 +449,21 @@ sources/device/DeviceController.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/data/MDDBloodLeakData.cpp \ + sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ + sources/model/dd/data/MDDDialysatePumpData.cpp \ sources/model/dd/data/MDDGenDialysateData.cpp \ + sources/model/dd/data/MDDHeatersData.cpp \ + sources/model/dd/data/MDDLevelData.cpp \ + sources/model/dd/data/MDDPressuresData.cpp \ + sources/model/dd/data/MDDTemperaturesData.cpp \ + sources/model/dd/data/MDDValvesStatesData.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/data/MTDAirBubbleData.cpp \ + sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ sources/model/td/data/MTDBatteryData.cpp \ sources/model/td/data/MTDEjectorData.cpp \ @@ -462,14 +481,23 @@ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ + sources/view/dd/data/VDDBloodLeakData.cpp \ + sources/view/dd/data/VDDConcentratePumpData.cpp \ sources/view/dd/data/VDDConductivityData.cpp \ + sources/view/dd/data/VDDDialysatePumpData.cpp \ sources/view/dd/data/VDDGenDialysateData.cpp \ + sources/view/dd/data/VDDHeatersData.cpp \ + sources/view/dd/data/VDDLevelData.cpp \ + sources/view/dd/data/VDDPressuresData.cpp \ + sources/view/dd/data/VDDTemperaturesData.cpp \ + sources/view/dd/data/VDDValvesStatesData.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 \ @@ -538,7 +566,6 @@ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MHDSyringePumpData.cpp \ - sources/model/hd/data/MHDAirBubbleData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -569,16 +596,11 @@ sources/model/dg/data/MDGDebugText.cpp \ sources/model/dg/data/MDGGeneralEvent.cpp \ sources/model/dg/data/MDGDrainPumpData.cpp \ - sources/model/dg/data/MDGHeatersData.cpp \ sources/model/dg/data/MDGLoadCellReadingsData.cpp \ sources/model/dg/data/MDGOperationModeData.cpp \ - sources/model/dg/data/MDGPressuresData.cpp \ sources/model/dg/data/MDGReservoirData.cpp \ sources/model/dg/data/MDGROPumpData.cpp \ - sources/model/dg/data/MDGTemperaturesData.cpp \ - sources/model/dg/data/MDGValvesStatesData.cpp \ sources/model/dg/data/MDGAccelerometerData.cpp \ - sources/model/dg/data/MDDLevelData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -597,6 +619,8 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data + 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 \ @@ -661,7 +685,6 @@ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDSyringePumpData.cpp \ - sources/view/hd/data/VHDAirBubbleData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ @@ -682,16 +705,11 @@ \ # ---------- Views - DG - States \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ - sources/view/dg/data/VDGHeatersData.cpp \ sources/view/dg/data/VDGLoadCellReadingsData.cpp \ sources/view/dg/data/VDGOperationModeData.cpp \ - sources/view/dg/data/VDGPressuresData.cpp \ sources/view/dg/data/VDGROPumpData.cpp \ sources/view/dg/data/VDGReservoirData.cpp \ - sources/view/dg/data/VDGTemperaturesData.cpp \ - sources/view/dg/data/VDGValvesStatesData.cpp \ sources/view/dg/data/VDGAccelerometerData.cpp \ - sources/view/dg/data/VDDLevelData.cpp \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \