Index: denali.pro =================================================================== diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 --- denali.pro (.../denali.pro) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) +++ denali.pro (.../denali.pro) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) @@ -38,6 +38,7 @@ sources/model/hd/alarm \ sources/model/hd/data \ sources/model/dg/data \ + sources/model/dg/adjustment \ sources/view \ sources/view/hd/adjustment \ sources/view/hd/alarm \ @@ -71,6 +72,8 @@ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmClearedCondition.h \ + \ # ---------- Models - HD - Adjustment + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ @@ -87,19 +90,22 @@ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.h \ \ # ---------- Models - HD - Data + sources/model/hd/data/MHDOperationModeData.h \ + sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ sources/model/hd/data/MTreatmentOutletFlowData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/MTreatmentPressureOcclusionData.h \ sources/model/hd/data/MTreatmentStatesData.h \ - sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ sources/model/hd/data/MTreatmentHeparinData.h \ sources/model/hd/data/MTreatmentRinsebackData.h \ sources/model/hd/data/MTreatmentRecirculateData.h \ sources/model/hd/data/MTreatmentBloodPrimeData.h \ sources/model/hd/data/MPrimingData.h \ + \ # ---------- Models - DG - Adjustment + sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -110,6 +116,7 @@ sources/model/dg/data/MDGROPumpData.h \ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ + sources/model/dg/data/MDGAccelerometerData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ @@ -132,6 +139,8 @@ sources/view/VPriming.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ + \ # ---------- Views - HD - Adjustment + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ @@ -148,29 +157,31 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \ \ # ---------- Views - HD - Data + sources/view/hd/data/VHDOperationModeData.h \ + sources/view/hd/data/VHDTreatmentStatesData.h \ + sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VTreatmentTime.h \ sources/view/hd/data/VTreatmentBloodFlow.h \ sources/view/hd/data/VTreatmentDialysateFlow.h \ sources/view/hd/data/VTreatmentUltrafiltration.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/hd/data/VTreatmentPressureOcclusion.h \ - sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/VTreatmentSalineData.h \ sources/view/hd/data/VTreatmentHeparinData.h \ sources/view/hd/data/VTreatmentRinsebackData.h \ sources/view/hd/data/VTreatmentRecirculateData.h \ sources/view/hd/data/VTreatmentBloodPrimeData.h \ - sources/view/hd/data/VHDTreatmentStatesData.h \ \ # ---------- 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/VDGOperationModeData.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 \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -208,6 +219,8 @@ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmClearedCondition.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ + \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \ @@ -222,19 +235,22 @@ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Data + sources/model/hd/data/MHDAccelerometerData.cpp \ + sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ sources/model/hd/data/MTreatmentOutletFlowData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/MTreatmentPressureOcclusionData.cpp \ sources/model/hd/data/MTreatmentStatesData.cpp \ - sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ sources/model/hd/data/MTreatmentHeparinData.cpp \ sources/model/hd/data/MTreatmentRinsebackData.cpp \ sources/model/hd/data/MTreatmentRecirculateData.cpp \ sources/model/hd/data/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/MPrimingData.cpp \ + \ # ---------- Models - DG - Adjustment + sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ @@ -245,6 +261,7 @@ sources/model/dg/data/MDGROPumpData.cpp \ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ + sources/model/dg/data/MDGAccelerometerData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -265,6 +282,8 @@ sources/view/VPowerOff.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + \ # ---------- Views - HD - Adjustment + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ @@ -281,6 +300,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \ \ # ---------- Views - HD - Data + sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VTreatmentTime.cpp \ sources/view/hd/data/VTreatmentBloodFlow.cpp \ sources/view/hd/data/VTreatmentDialysateFlow.cpp \ @@ -304,6 +324,7 @@ sources/view/dg/data/VDGReservoirData.cpp \ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ + sources/view/dg/data/VDGAccelerometerData.cpp \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \