Index: denali.pro =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r06d10ee1174f0947a01087554f3da3109b47aef6 --- denali.pro (.../denali.pro) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ denali.pro (.../denali.pro) (revision 06d10ee1174f0947a01087554f3da3109b47aef6) @@ -1,6 +1,6 @@ QT += widgets qml quick serialbus concurrent CONFIG += c++17 warn_on -QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps // see .ii and .s files +QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files #CONFIG += disable_crc disable_crc { @@ -28,17 +28,19 @@ INCLUDEPATH += \ common \ sources \ - sources/model \ - sources/view \ sources/storage \ sources/gui \ sources/canbus \ sources/utility \ sources/abstract \ + sources/model \ sources/model/hd/adjustment \ sources/model/hd/alarm \ sources/model/hd/data \ sources/model/dg/data \ + sources/view \ + sources/view/hd/adjustment \ + sources/view/hd/data \ sources/view/dg/data HEADERS += \ @@ -72,6 +74,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -80,6 +83,7 @@ sources/model/hd/data/MTreatmentPressureOcclusionData.h \ sources/model/hd/data/MTreatmentStatesData.h \ sources/model/hd/data/MHDOperationModeData.h \ + sources/model/hd/data/MTreatmentSalineData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -104,33 +108,39 @@ sources/gui/guiview.h \ sources/gui/guicontroller.h \ \ # ---------- Views ---------- - 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/VEventSpy.h \ + sources/view/hd/data/VHDTreatmentStatesData.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ + \ # ---------- Views - Alarm sources/view/valarmstatus.h \ - sources/view/VHDOperationModeData.h \ - sources/view/vtreatmenttime.h \ - sources/view/vtreatmentbloodflow.h \ - sources/view/vtreatmentdialysateflow.h \ - sources/view/vtreatmentultrafiltration.h \ - sources/view/vtreatmentranges.h \ - sources/view/vtreatmentpressureocclusion.h \ - \ # Treatment Adjustments + \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/vtreatmentadjustmentresponsebase.h \ sources/view/vtreatmentadjustmentduration.h \ sources/view/vtreatmentadjustmentflows.h \ sources/view/vtreatmentadjustmentultrafiltrationstate.h \ sources/view/vtreatmentadjustmentultrafiltrationedit.h \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + \ # ---------- Views - HD - Data + sources/view/vtreatmenttime.h \ + sources/view/vtreatmentbloodflow.h \ + sources/view/vtreatmentdialysateflow.h \ + sources/view/vtreatmentultrafiltration.h \ + sources/view/vtreatmentranges.h \ + sources/view/vtreatmentpressureocclusion.h \ + sources/view/hd/data/VHDOperationModeData.h \ + sources/view/hd/data/VTreatmentSalineData.h \ + \ # ---------- Views - DG - Data + 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 \ \ # Storage sources/storage/storageglobals.h \ sources/storage/filehandler.h \ @@ -168,6 +178,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ @@ -176,6 +187,7 @@ sources/model/hd/data/MTreatmentPressureOcclusionData.cpp \ sources/model/hd/data/MTreatmentStatesData.cpp \ sources/model/hd/data/MHDOperationModeData.cpp \ + sources/model/hd/data/MTreatmentSalineData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ @@ -199,6 +211,29 @@ sources/gui/guiview.cpp \ 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 \ + \ # ---------- Views - HD - Adjustment - In-Treatment + sources/view/vtreatmentadjustmentresponsebase.cpp \ + sources/view/vtreatmentadjustmentduration.cpp \ + sources/view/vtreatmentadjustmentflows.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + \ # ---------- Views - HD - Data + sources/view/vtreatmenttime.cpp \ + sources/view/vtreatmentbloodflow.cpp \ + sources/view/vtreatmentdialysateflow.cpp \ + sources/view/vtreatmentultrafiltration.cpp \ + sources/view/vtreatmentranges.cpp \ + sources/view/vtreatmentpressureocclusion.cpp \ + sources/view/hd/data/VHDOperationModeData.cpp \ + sources/view/hd/data/VTreatmentSalineData.cpp \ + \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ sources/view/dg/data/VDGLoadCellReadingsData.cpp \ @@ -208,23 +243,6 @@ sources/view/dg/data/VDGReservoirData.cpp \ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ - \ - sources/view/vpoweroff.cpp \ - sources/view/valarmstatus.cpp \ - sources/view/VHDOperationModeData.cpp \ - sources/view/vtreatmenttime.cpp \ - sources/view/vtreatmentbloodflow.cpp \ - sources/view/vtreatmentdialysateflow.cpp \ - sources/view/vtreatmentultrafiltration.cpp \ - sources/view/vtreatmentranges.cpp \ - sources/view/vtreatmentpressureocclusion.cpp \ - \ # Treatment Adjustments - sources/view/vtreatmentadjustmentresponsebase.cpp \ - sources/view/vtreatmentadjustmentduration.cpp \ - sources/view/vtreatmentadjustmentflows.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ \ # Storage sources/storage/storageglobals.cpp \ sources/storage/filehandler.cpp \