Index: denali.pro =================================================================== diff -u -r84c5373209a1a488c00917995f5553d442d159a4 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- denali.pro (.../denali.pro) (revision 84c5373209a1a488c00917995f5553d442d159a4) +++ denali.pro (.../denali.pro) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -52,6 +52,9 @@ common/MsgDefs.h \ \ # Main sources/main.h \ + sources/model/MTreatmentParameters.h \ + sources/model/MTreatmentParametersResp.h \ + sources/storage/filesaver.h \ sources/model/MDGDebugText.h \ sources/model/MHDDebugText.h \ sources/storage/DriveWatcher.h \ @@ -76,6 +79,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -109,6 +113,7 @@ sources/gui/GuiView.h \ sources/gui/GuiController.h \ \ # ---------- Views ---------- + sources/view/VCreateTreatment.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ @@ -122,6 +127,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Data sources/view/hd/data/VTreatmentTime.h \ sources/view/hd/data/VTreatmentBloodFlow.h \ @@ -158,6 +164,8 @@ \ # common \ # Main main.cpp \ + sources/model/MTreatmentParameters.cpp \ + sources/model/MTreatmentParametersResp.cpp \ sources/Threads.cpp \ sources/MainTimer.cpp \ sources/ApplicationPost.cpp \ @@ -177,6 +185,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Data sources/model/MHDDebugText.cpp \ sources/model/hd/data/MTreatmentTimeData.cpp \ @@ -213,6 +222,7 @@ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ sources/view/VPowerOff.cpp \ + sources/view/VCreateTreatment.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment @@ -223,6 +233,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VTreatmentTime.cpp \ sources/view/hd/data/VTreatmentBloodFlow.cpp \ @@ -248,14 +259,13 @@ sources/storage/FileHandler.cpp \ sources/storage/Logger.cpp \ sources/storage/DriveWatcher.cpp \ + sources/storage/filesaver.cpp \ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ sources/utility/types.cpp -# sources/configuration/display.cpp \ -# sources/configuration/sound.cpp \ -# sources/storage/settings.cpp \ + RESOURCES += \ denali.qrc @@ -264,11 +274,8 @@ VER_MINOR="\\\"${minorVersion}\\\"" \ VER_MICRO="\\\"${microVersion}\\\"" \ VER_REVIS="\\\"${buildNumber}\\\"" \ - VER_MAJOR_DEV=\\\"0\\\" \ - VER_MINOR_DEV=\\\"0\\\" \ - VER_MICRO_DEV=\\\"0\\\" \ VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \ - VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ + VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\" CodeCoverage {