Index: leahi.pro =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 --- leahi.pro (.../leahi.pro) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ leahi.pro (.../leahi.pro) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) @@ -59,10 +59,20 @@ sources/model \ sources/model/td \ sources/model/td/data \ + sources/model/td/data/treatment \ sources/model/td/alarm \ + sources/model/td/adjustment \ + sources/model/td/adjustment/settings \ + sources/model/dd \ + sources/model/dd/data \ + sources/model/dd/adjustment \ + sources/model/dd/adjustment/settings \ sources/view \ sources/view/td \ sources/view/td/data \ + sources/view/td/data/treatment \ + sources/view/dd \ + sources/view/dd/data \ sources/view/confirm \ sources/view/settings \ \ @@ -131,15 +141,26 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ - sources/model/dg/data/MDDConductivityData.h \ - sources/model/dg/data/MDDGenDialysateData.h \ - sources/model/hd/data/treatment/MTreatmentSetPointData.h \ - sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.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/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ + sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/data/MDDConductivityData.h \ + sources/model/dd/data/MDDGenDialysateData.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/MTDAirTrapData.h \ + sources/model/td/data/MTDBatteryData.h \ + sources/model/td/data/MTDEjectorData.h \ + sources/model/td/data/MTDSwitchesData.h \ + sources/model/td/data/MTDTemperatureData.h \ + sources/model/td/data/MTDValvesData.h \ + sources/model/td/data/MTDVoltageData.h \ + sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ + sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ + sources/model/td/data/treatment/MTreatmentSalineData.h \ + sources/model/td/data/treatment/MTreatmentSetPointData.h \ + sources/model/td/data/treatment/MTreatmentTimeData.h \ + sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ sources/bluetooth/BluetoothInterface.h \ @@ -152,6 +173,12 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED + sources/view/dd/data/VDDConductivityData.h \ + sources/view/dd/data/VDDGenDialysateData.h \ + sources/view/hd/data/VTreatmentRanges.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 \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ @@ -232,21 +259,10 @@ sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDAirBubbleData.h \ - sources/model/hd/data/MTDAirTrapData.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 \ - sources/model/hd/data/treatment/MTreatmentBloodFlowData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h \ - sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h \ - sources/model/hd/data/treatment/MTreatmentSalineData.h \ sources/model/hd/data/treatment/MTreatmentHeparinData.h \ sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ @@ -301,16 +317,8 @@ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.h \ \ # ---------- Views - POST - sources/view/dg/data/VDDGenDialysateData.h \ sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings - sources/view/hd/data/VTDBatteryData.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/hd/data/treatment/VTreatmentSetPointData.h \ - sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.h \ sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ sources/view/settings/VLocalization.h \ @@ -374,14 +382,7 @@ sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDAirBubbleData.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 \ - sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \ - sources/view/hd/data/treatment/VTreatmentSalineData.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ @@ -402,7 +403,6 @@ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ sources/view/dg/data/VDGAccelerometerData.h \ - sources/view/dg/data/VDDConductivityData.h \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -412,7 +412,17 @@ sources/utility/format.h \ sources/utility/types.h \ sources/utility/encryption.h \ - sources/utility/qrcodegen.h + sources/utility/qrcodegen.h \ + sources/view/td/data/VTDSwitchesData.h \ + sources/view/td/data/VTDTemperatureData.h \ + sources/view/td/data/VTDValvesData.h \ + sources/view/td/data/VTDVoltageData.h \ + sources/view/td/data/treatment/VTreatmentBloodFlow.h \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ + sources/view/td/data/treatment/VTreatmentSalineData.h \ + sources/view/td/data/treatment/VTreatmentSetPointData.h \ + sources/view/td/data/treatment/VTreatmentTime.h \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h SOURCES += \ \ # common @@ -426,24 +436,30 @@ \ # 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/dg/data/MDDConductivityData.cpp \ - sources/model/dg/data/MDDGenDialysateData.cpp \ - sources/model/hd/data/treatment/MTreatmentSetPointData.cpp \ - sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/data/MDDConductivityData.cpp \ + sources/model/dd/data/MDDGenDialysateData.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/MTDAirTrapData.cpp \ + sources/model/td/data/MTDBatteryData.cpp \ + sources/model/td/data/MTDEjectorData.cpp \ + sources/model/td/data/MTDSwitchesData.cpp \ + sources/model/td/data/MTDTemperatureData.cpp \ + sources/model/td/data/MTDValvesData.cpp \ + sources/model/td/data/MTDVoltageData.cpp \ + sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ + sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ + sources/model/td/data/treatment/MTreatmentSalineData.cpp \ + sources/model/td/data/treatment/MTreatmentSetPointData.cpp \ + sources/model/td/data/treatment/MTreatmentTimeData.cpp \ + sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ sources/view/dg/data/VDDGenDialysateData.cpp \ - sources/view/hd/data/VTDBatteryData.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 \ @@ -520,21 +536,10 @@ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDAirBubbleData.cpp \ - sources/model/hd/data/MTDAirTrapData.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 \ - sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp \ - sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp \ - sources/model/hd/data/treatment/MTreatmentSalineData.cpp \ sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ @@ -588,6 +593,9 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data + sources/view/td/data/VTDAirTrapData.cpp \ + sources/view/td/data/VTDBatteryData.cpp \ + sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ @@ -597,8 +605,6 @@ sources/view/hd/alarm/VAlarmStatus.cpp \ sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings - sources/view/hd/data/treatment/VTreatmentSetPointData.cpp \ - sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.cpp \ sources/view/settings/VSettings.cpp \ sources/view/settings/VLocalization.cpp \ sources/view/settings/VDateTime.cpp \ @@ -654,19 +660,13 @@ sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDAirBubbleData.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 \ sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/VTreatmentRanges.cpp \ - sources/view/hd/data/treatment/VTreatmentTime.cpp \ - sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ - sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \ - sources/view/hd/data/treatment/VTreatmentSalineData.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ \ # ---------- Views - HD - Data - End-Treatment sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ @@ -698,7 +698,17 @@ sources/utility/format.cpp \ sources/utility/types.cpp \ sources/utility/encryption.cpp \ - sources/utility/qrcodegen.cpp + sources/utility/qrcodegen.cpp \ + sources/view/td/data/VTDSwitchesData.cpp \ + sources/view/td/data/VTDTemperatureData.cpp \ + sources/view/td/data/VTDValvesData.cpp \ + sources/view/td/data/VTDVoltageData.cpp \ + sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ + sources/view/td/data/treatment/VTreatmentSalineData.cpp \ + sources/view/td/data/treatment/VTreatmentSetPointData.cpp \ + sources/view/td/data/treatment/VTreatmentTime.cpp \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp RESOURCES += \ leahi.qrc