Index: leahi.pro =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07 --- leahi.pro (.../leahi.pro) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ leahi.pro (.../leahi.pro) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07) @@ -131,6 +131,11 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \ + sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h \ + sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ sources/bluetooth/BluetoothInterface.h \ @@ -158,8 +163,6 @@ sources/model/settings/MBluetooth.h \ sources/model/ui/data/MUIBloodPressureData.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ @@ -178,8 +181,6 @@ sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \ - sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment @@ -227,7 +228,14 @@ sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDAirBubbleData.h \ - sources/model/hd/data/MHDAirTrapData.h \ + sources/model/hd/data/MTDAirTrapData.h \ + sources/model/hd/data/MTDBloodPumpData.h \ + sources/model/hd/data/MTDVoltageData.h \ + sources/model/hd/data/MTDTemperatureData.h \ + sources/model/hd/data/MTDValvesData.h \ + sources/model/hd/data/MTDBatteryData.h \ + sources/model/hd/data/MTDSwitchesData.h \ + sources/model/hd/data/MTDEjectorData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentTimeData.h \ @@ -251,7 +259,6 @@ sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ @@ -294,6 +301,12 @@ \ # ---------- Views - POST sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings + sources/view/hd/data/VTDBatteryData.h \ + sources/view/hd/data/VTDBloodPumpData.h \ + sources/view/hd/data/VTDEjectorData.h \ + sources/view/hd/data/VTDSwitchesData.h \ + sources/view/hd/data/VTDTemperatureData.h \ + sources/view/hd/data/VTDValvesData.h \ sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ sources/view/settings/VLocalization.h \ @@ -356,9 +369,10 @@ sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDAirBubbleData.h \ - sources/view/hd/data/VHDAirTrapData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/VTreatmentRanges.h \ + sources/view/hd/data/VTDAirTrapData.h \ + sources/view/hd/data/VTDVoltageData.h \ sources/view/hd/data/treatment/VTreatmentTime.h \ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ @@ -409,9 +423,20 @@ \ # Controllers sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ + sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \ + sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ + sources/view/hd/data/VTDBatteryData.cpp \ + sources/view/hd/data/VTDBloodPumpData.cpp \ + sources/view/hd/data/VTDEjectorData.cpp \ + sources/view/hd/data/VTDSwitchesData.cpp \ + sources/view/hd/data/VTDTemperatureData.cpp \ + sources/view/hd/data/VTDValvesData.cpp \ sources/view/hd/data/post/VHDPOSTData.cpp \ sources/bluetooth/BluetoothInterface.cpp \ sources/cloudsync/CloudSyncController.cpp \ @@ -433,8 +458,6 @@ sources/model/settings/MSettings.cpp \ sources/model/settings/MBluetooth.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ @@ -452,8 +475,6 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment @@ -492,7 +513,14 @@ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDAirBubbleData.cpp \ - sources/model/hd/data/MHDAirTrapData.cpp \ + sources/model/hd/data/MTDAirTrapData.cpp \ + sources/model/hd/data/MTDBloodPumpData.cpp \ + sources/model/hd/data/MTDVoltageData.cpp \ + sources/model/hd/data/MTDTemperatureData.cpp \ + sources/model/hd/data/MTDValvesData.cpp \ + sources/model/hd/data/MTDBatteryData.cpp \ + sources/model/hd/data/MTDSwitchesData.cpp \ + sources/model/hd/data/MTDEjectorData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ @@ -518,7 +546,6 @@ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress @@ -619,8 +646,9 @@ sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDAirBubbleData.cpp \ - sources/view/hd/data/VHDAirTrapData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ + sources/view/hd/data/VTDAirTrapData.cpp \ + sources/view/hd/data/VTDVoltageData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \