Index: denali.pro =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r0a4abcc41defc031ae20dd79f9550619bc6c9806 --- denali.pro (.../denali.pro) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ denali.pro (.../denali.pro) (revision 0a4abcc41defc031ae20dd79f9550619bc6c9806) @@ -89,15 +89,17 @@ sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.h \ - \ # ---------- Models - HD - Data + \ # ---------- Models - HD - States Data sources/model/hd/data/MHDOperationModeData.h \ + sources/model/hd/data/MPreTreatmentStatesData.h \ + sources/model/hd/data/MTreatmentStatesData.h \ + \ # ---------- Models - HD - Data 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/MTreatmentSalineData.h \ sources/model/hd/data/MTreatmentHeparinData.h \ sources/model/hd/data/MTreatmentRinsebackData.h \ @@ -156,9 +158,11 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \ - \ # ---------- Views - HD - Data + \ # ---------- Views - HD - States Data sources/view/hd/data/VHDOperationModeData.h \ + sources/view/hd/data/VPreTreatmentStatesData.h \ sources/view/hd/data/VHDTreatmentStatesData.h \ + \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VTreatmentTime.h \ sources/view/hd/data/VTreatmentBloodFlow.h \ @@ -234,15 +238,17 @@ sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \ + \ # ---------- Models - HD - States Data + sources/model/hd/data/MHDOperationModeData.cpp \ + sources/model/hd/data/MPreTreatmentStatesData.cpp \ + sources/model/hd/data/MTreatmentStatesData.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/MTreatmentSalineData.cpp \ sources/model/hd/data/MTreatmentHeparinData.cpp \ sources/model/hd/data/MTreatmentRinsebackData.cpp \ @@ -299,6 +305,10 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \ + \ # ---------- Views - HD - States Data + sources/view/hd/data/VHDOperationModeData.cpp \ + sources/view/hd/data/VPreTreatmentStatesData.cpp \ + sources/view/hd/data/VHDTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ sources/view/hd/data/VTreatmentTime.cpp \ @@ -307,13 +317,11 @@ sources/view/hd/data/VTreatmentUltrafiltration.cpp \ sources/view/hd/data/VTreatmentRanges.cpp \ sources/view/hd/data/VTreatmentPressureOcclusion.cpp \ - 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 \ sources/view/dg/data/VDGHeatersData.cpp \