Index: denali.pro =================================================================== diff -u -r54aae98b72e3804008acad0bbbb7573be8e35707 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- denali.pro (.../denali.pro) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) +++ denali.pro (.../denali.pro) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -49,6 +49,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 \ @@ -73,7 +74,6 @@ sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MPowerOff.h \ - sources/model/MEndTreatmentResponse.h \ sources/model/MStartTreatmentResponse.h \ sources/model/MTreatmentParametersResp.h \ sources/model/MDGDebugText.h \ @@ -83,6 +83,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 \ @@ -94,17 +96,27 @@ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \ + \ # ---------- Models - HD - Adjustment - Post-Treatment + sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.h \ + 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 \ @@ -115,6 +127,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 \ @@ -135,7 +148,6 @@ sources/view/VBluetooth.h \ sources/view/VBluetoothDeviceInfo.h \ sources/view/VTreatmentCreate.h \ - sources/view/VTreatmentEnd.h \ sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ @@ -144,6 +156,8 @@ sources/view/VVitals.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 \ @@ -155,27 +169,36 @@ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h \ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \ + \ # ---------- Views - HD - Adjustment - Post-Treatment + sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \ + 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/VHDTreatmentStatesData.h \ + sources/view/hd/data/VTreatmentRinsebackData.h \ + sources/view/hd/data/VTreatmentRecirculateData.h \ + sources/view/hd/data/VTreatmentBloodPrimeData.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 \ @@ -204,7 +227,6 @@ sources/model/MAbstract.cpp \ sources/model/MPowerOff.cpp \ sources/model/MHDDebugText.cpp \ - sources/model/MEndTreatmentResponse.cpp \ sources/model/MStartTreatmentResponse.cpp \ sources/model/MTreatmentParametersResp.cpp \ sources/model/MDGDebugText.cpp \ @@ -214,6 +236,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 \ @@ -223,17 +247,27 @@ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \ + \ # ---------- Models - HD - Adjustment - Post-Treatment + sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \ + 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 \ @@ -244,6 +278,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 \ @@ -263,14 +298,15 @@ sources/view/VBluetooth.cpp \ sources/view/VBluetoothDeviceInfo.cpp \ sources/view/VTreatmentCreate.cpp \ - sources/view/VTreatmentEnd.cpp \ sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPriming.cpp \ sources/view/VPowerOff.cpp \ sources/view/VVitals.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 \ @@ -282,7 +318,12 @@ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ + \ # ---------- Views - HD - Adjustment - Post-Treatment + sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \ + 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 \ @@ -292,6 +333,9 @@ sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/VTreatmentSalineData.cpp \ sources/view/hd/data/VTreatmentHeparinData.cpp \ + sources/view/hd/data/VTreatmentRinsebackData.cpp \ + sources/view/hd/data/VTreatmentRecirculateData.cpp \ + sources/view/hd/data/VTreatmentBloodPrimeData.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ @@ -303,6 +347,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 \