Index: denali.pro =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -re125bd5cf13750eaf241d518b9c846139afaa81c --- denali.pro (.../denali.pro) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ denali.pro (.../denali.pro) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -1,5 +1,6 @@ QT += widgets qml quick serialbus concurrent CONFIG += c++17 warn_on +# CONFIG += disable-desktop QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii #CONFIG += disable_crc @@ -20,12 +21,13 @@ # and use that MACRO for conditional build message($$QMAKESPEC) linux-g++ { - message(Linux.g++) - DEFINES += BUILD_FOR_GCC + message("Building for desktop") + DEFINES += BUILD_FOR_DESKTOP } + linux-oe-generic-g++ { - message(Linux.poky) - DEFINES += BUILD_FOR_POKY + message("Building for target") + DEFINES += BUILD_FOR_TARGET } # The following define makes your compiler emit warnings if you use @@ -50,16 +52,37 @@ sources/model \ sources/model/settings \ sources/model/hd/adjustment \ + sources/model/hd/adjustment/disinfect \ + sources/model/hd/adjustment/settings \ + sources/model/hd/adjustment/pretreatment \ + sources/model/hd/adjustment/treatment \ + sources/model/hd/adjustment/posttreatment \ sources/model/hd/alarm \ sources/model/hd/data \ + sources/model/hd/data/pretreatment \ + sources/model/hd/data/treatment \ + sources/model/hd/data/posttreatment \ sources/model/dg/data \ + sources/model/dg/data/pretreatment \ + sources/model/dg/data/disinfect \ sources/model/dg/adjustment \ + sources/model/dg/adjustment/settings \ sources/view \ sources/view/settings \ + sources/view/pretreatment \ sources/view/hd/adjustment \ + sources/view/hd/adjustment/pretreatment \ + sources/view/hd/adjustment/treatment \ + sources/view/hd/adjustment/posttreatment \ + sources/view/hd/adjustment/disinfect \ sources/view/hd/alarm \ sources/view/hd/data \ - sources/view/dg/data + sources/view/hd/data/pretreatment \ + sources/view/hd/data/treatment \ + sources/view/hd/data/posttreatment \ + sources/view/dg/data \ + sources/view/dg/data/pretreatment \ + sources/view/dg/data/disinfect HEADERS += \ \ # common @@ -74,6 +97,7 @@ sources/AlarmGenerator.h \ sources/ApplicationPost.h \ \ # Controllers + sources/storage/Settings.h \ sources/ApplicationController.h \ \ # ---------- Models ---------- sources/model/MModel.h \ @@ -85,59 +109,79 @@ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmClearedCondition.h \ + \ # ---------- Models - States Data + sources/model/hd/data/MHDOperationModeData.h \ + sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ + sources/model/hd/data/treatment/MTreatmentStatesData.h \ + sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ + sources/model/dg/data/disinfect/MDisinfectStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/MAdjustPowerOff.h \ - sources/model/hd/adjustment/MAdjustHDVersionsResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ + \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment - sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment - sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ - sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h \ - sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ + \ # ---------- Models - HD - Adjustment - End-Treatment + sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.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 - States Data - sources/model/hd/data/MHDOperationModeData.h \ - sources/model/hd/data/MPreTreatmentStatesData.h \ - sources/model/hd/data/MTreatmentStatesData.h \ + sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \ + sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \ + sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ + \ # ---------- Models - HD - Adjustment - Disinfeection + sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h \ + sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \ + sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress - sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \ - sources/model/hd/data/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ + sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.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/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/treatment/MTreatmentTimeData.h \ + sources/model/hd/data/treatment/MTreatmentFlowsData.h \ + sources/model/hd/data/treatment/MTreatmentOutletFlowData.h \ + sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h \ + sources/model/hd/data/treatment/MTreatmentSalineData.h \ + sources/model/hd/data/treatment/MTreatmentHeparinData.h \ + sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ + sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ + sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ \ # ---------- Models - DG - Adjustment - sources/model/dg/adjustment/MAdjustDGVersionsResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ + \ # ---------- Models - DG - Adjustment - Settings + sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress - sources/model/dg/data/MDGFilterFlushData.h \ + sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ + \ # ---------- Models - DG - Data - Disinfect - Progress + sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.h \ + sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h \ + sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.h \ sources/model/dg/data/MDGDrainPumpData.h \ @@ -164,62 +208,76 @@ sources/gui/GuiView.h \ sources/gui/GuiController.h \ \ # ---------- Views ---------- - sources/storage/Settings.h \ sources/view/VTreatmentCreate.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ + \ # ---------- Views - Settings + sources/view/settings/VDateTime.h \ + sources/view/settings/VSettings.h \ + sources/view/settings/VAdjustmentVersions.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment - sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \ + sources/view/VAdjustmentResponseBase.h \ \ # ---------- Views - HD - Adjustment - Pre-Treatment - sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ + \ # ---------- Views - HD - Adjustment - End-Treatment + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h \ \ # ---------- Views - HD - Adjustment - Post-Treatment - sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \ + \ # ---------- Views - HD - Adjustment - Disinfection + sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ + sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h \ \ # ---------- Views - HD - Data - States sources/view/hd/data/VHDOperationModeData.h \ - sources/view/hd/data/VHDTreatmentStatesData.h \ - sources/view/hd/data/VPreTreatmentStatesData.h \ + sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ + sources/view/hd/data/treatment/VHDTreatmentStatesData.h \ + sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress - sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \ - sources/view/hd/data/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h \ + sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ + sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ + sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data 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/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/treatment/VTreatmentTime.h \ + sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ + sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ + sources/view/hd/data/treatment/VTreatmentUltrafiltration.h \ + sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \ + sources/view/hd/data/treatment/VTreatmentSalineData.h \ + sources/view/hd/data/treatment/VTreatmentHeparinData.h \ + sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ + sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ + sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress - sources/view/dg/data/VDGFilterFlushData.h \ + sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ + \ # ---------- Views - DG - Data - Disinfection - Progress + sources/view/dg/data/disinfect/VDisinfectDGData.h \ + \ # ---------- Views - DG - States + sources/view/dg/data/disinfect/VDisinfectStatesData.h \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGOperationModeData.h \ sources/view/dg/data/VDGDrainPumpData.h \ @@ -240,11 +298,7 @@ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ - sources/utility/types.h \ - sources/view/settings/VSettings.h -# sources/configuration/display.h \ -# sources/configuration/sound.h \ -# sources/storage/settings.h \ + sources/utility/types.h SOURCES += \ \ # common @@ -255,6 +309,7 @@ sources/AlarmGenerator.cpp \ sources/ApplicationPost.cpp \ \ # Controllers + sources/storage/Settings.cpp \ sources/ApplicationController.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ @@ -265,57 +320,73 @@ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmClearedCondition.cpp \ + \ # ---------- Models - Data - States + sources/model/hd/data/MHDOperationModeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ + sources/model/hd/data/treatment/MTreatmentStatesData.cpp \ + sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ + sources/model/dg/data/disinfect/MDisinfectStatesData.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ - sources/model/hd/adjustment/MAdjustHDVersionsResponse.cpp \ + \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment - sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment - sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ + \ # ---------- Models - HD - Adjustment - End-Treatment + sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ + sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Adjustment - Post-Treatment - sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \ - sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \ + sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \ + sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \ + \ # ---------- Models - HD - Adjustment - Disinfection + sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \ + sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp \ \ # ---------- Models - HD - Data \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp \ - sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \ - \ # ---------- Models - HD - Data - States - sources/model/hd/data/MHDOperationModeData.cpp \ - sources/model/hd/data/MPreTreatmentStatesData.cpp \ - sources/model/hd/data/MTreatmentStatesData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDAccelerometerData.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/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/treatment/MTreatmentTimeData.cpp \ + sources/model/hd/data/treatment/MTreatmentFlowsData.cpp \ + sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp \ + sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp \ + sources/model/hd/data/treatment/MTreatmentSalineData.cpp \ + sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \ + sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ + sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ + sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ \ # ---------- Models - DG - Adjustment - sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \ + \ # ---------- Models - DG - Adjustment - Settings + sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress - sources/model/dg/data/MDGFilterFlushData.cpp \ + sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ + \ # ---------- Models - DG - Data - Disinfection - Progress + sources/model/dg/data/disinfect/MDisinfectDGFlushTimeData.cpp \ + sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp \ + sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.cpp \ sources/model/dg/data/MDGDrainPumpData.cpp \ @@ -341,63 +412,77 @@ sources/gui/GuiView.cpp \ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- - sources/storage/Settings.cpp \ sources/view/VTreatmentCreate.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPowerOff.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + \ # ---------- Views - Settings + sources/view/settings/VSettings.cpp \ + sources/view/settings/VDateTime.cpp \ + sources/view/settings/VAdjustmentVersions.cpp \ \ # ---------- Views - HD - Adjustment - sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ + sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - Pre-Treatment - sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ - sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ + sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ + \ # ---------- Views - HD - Adjustment - End-Treatment + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \ + sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp \ \ # ---------- Views - HD - Adjustment - Post-Treatment - sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ + sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \ + \ # ---------- Views - HD - Adjustment - Disinfection + sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ + sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp \ \ # ---------- Views - HD - States Data sources/view/hd/data/VHDOperationModeData.cpp \ - sources/view/hd/data/VPreTreatmentStatesData.cpp \ - sources/view/hd/data/VHDTreatmentStatesData.cpp \ + sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ + sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp \ + sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - \ # ---------- Views - HD - Data - Pre-Treament - sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp \ - \ # ---------- Views - HD - Data - In-Treament - sources/view/hd/data/VTreatmentTime.cpp \ - sources/view/hd/data/VTreatmentBloodFlow.cpp \ - sources/view/hd/data/VTreatmentDialysateFlow.cpp \ - sources/view/hd/data/VTreatmentUltrafiltration.cpp \ + \ # ---------- Views - HD - Data - Pre-Treatment + sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ + sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ + sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ + \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/VTreatmentRanges.cpp \ - sources/view/hd/data/VTreatmentPressureOcclusion.cpp \ - sources/view/hd/data/VTreatmentSalineData.cpp \ - sources/view/hd/data/VTreatmentHeparinData.cpp \ - \ # ---------- Views - HD - Data - Post-Treament - sources/view/hd/data/VTreatmentBloodPrimeData.cpp \ - sources/view/hd/data/VTreatmentRinsebackData.cpp \ - sources/view/hd/data/VTreatmentRecirculateData.cpp \ + sources/view/hd/data/treatment/VTreatmentTime.cpp \ + sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \ + sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ + sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp \ + sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \ + sources/view/hd/data/treatment/VTreatmentSalineData.cpp \ + sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ + \ # ---------- Views - HD - Data - End-Treatment + sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ + sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \ + sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress - sources/view/dg/data/VDGFilterFlushData.cpp \ + sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \ + \ # ---------- Views - DG - Data - Disinfect - Progress + sources/view/dg/data/disinfect/VDisinfectDGData.cpp \ + \ # ---------- Views - DG - States + sources/view/dg/data/disinfect/VDisinfectStatesData.cpp \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ @@ -418,10 +503,8 @@ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ - sources/utility/types.cpp \ - sources/view/settings/VSettings.cpp + sources/utility/types.cpp - RESOURCES += \ denali.qrc