Index: denali.pro =================================================================== diff -u -r06d10ee1174f0947a01087554f3da3109b47aef6 -rec116449529ae4a8306b1d52eeb109df809fef8e --- denali.pro (.../denali.pro) (revision 06d10ee1174f0947a01087554f3da3109b47aef6) +++ denali.pro (.../denali.pro) (revision ec116449529ae4a8306b1d52eeb109df809fef8e) @@ -37,6 +37,7 @@ sources/model/hd/adjustment \ sources/model/hd/alarm \ sources/model/hd/data \ + sources/model/dg/adjustment \ sources/model/dg/data \ sources/view \ sources/view/hd/adjustment \ @@ -75,6 +76,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -84,6 +86,9 @@ sources/model/hd/data/MTreatmentStatesData.h \ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ + sources/model/hd/data/MHDAccelerometerData.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 \ @@ -94,6 +99,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 \ @@ -109,7 +115,6 @@ sources/gui/guicontroller.h \ \ # ---------- Views ---------- sources/view/VEventSpy.h \ - sources/view/hd/data/VHDTreatmentStatesData.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ \ # ---------- Views - Alarm @@ -122,6 +127,7 @@ sources/view/vtreatmentadjustmentultrafiltrationedit.h \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \ \ # ---------- Views - HD - Data sources/view/vtreatmenttime.h \ sources/view/vtreatmentbloodflow.h \ @@ -131,6 +137,9 @@ sources/view/vtreatmentpressureocclusion.h \ sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/VTreatmentSalineData.h \ + sources/view/hd/data/VHDAccelerometerData.h \ + sources/view/hd/data/VHDTreatmentStatesData.h \ + \ # ---------- Views - DG - Adjustment \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.h \ sources/view/dg/data/VDGHeatersData.h \ @@ -141,6 +150,7 @@ 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/filehandler.h \ @@ -179,6 +189,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ @@ -188,6 +199,9 @@ sources/model/hd/data/MTreatmentStatesData.cpp \ sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ + sources/model/hd/data/MHDAccelerometerData.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 \ @@ -198,6 +212,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 \ @@ -212,7 +227,6 @@ sources/gui/guicontroller.cpp \ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ - sources/view/hd/data/VHDTreatmentStatesData.cpp \ sources/view/vpoweroff.cpp \ \ # ---------- Views - Alarm sources/view/valarmstatus.cpp \ @@ -224,6 +238,7 @@ sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ \ # ---------- Views - HD - Data sources/view/vtreatmenttime.cpp \ sources/view/vtreatmentbloodflow.cpp \ @@ -233,6 +248,9 @@ sources/view/vtreatmentpressureocclusion.cpp \ sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/VTreatmentSalineData.cpp \ + sources/view/hd/data/VHDAccelerometerData.cpp \ + sources/view/hd/data/VHDTreatmentStatesData.cpp \ + \ # ---------- Views - DG - Adjustment \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ @@ -243,6 +261,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 \