Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) @@ -23,6 +23,8 @@ #include "GuiView.h" #include "VEventSpy.h" #include "VGeneralEvent.h" +#include "VHeaderbarModel.h" +#include "VWaterSampleModel.h" // POST #include "VHDPOSTData.h" @@ -51,6 +53,9 @@ #include "VCloudSync.h" #include "VHDUsageInfo.h" #include "VAdjustmentInstitutionalRecord.h" +#include "VInstitutionalRecord.h" +#include "VAdjustmentAdvancedInstitutionalRecord.h" +#include "VAdvancedInstitutionalRecord.h" // states data #include "VTDOpModeData.h" #include "VPreTreatmentStatesData.h" @@ -98,11 +103,13 @@ #include "VTDSwitchesData.h" #include "VTDEjectorData.h" #include "VTDTemperatureData.h" +#include "VTreatmentTrends.h" +#include "VWaterSampleData.h" // DG data #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" #include "VDGLoadCellReadingsData.h" -#include "VDGOperationModeData.h" +#include "VDDOperationModeData.h" #include "VDDPressuresData.h" #include "VDGROPumpData.h" #include "VDGReservoirData.h" @@ -115,19 +122,44 @@ #include "VDDGenDialysateData.h" #include "VDDLevelData.h" #include "VDDBloodLeakData.h" +// FP data +#include "VFPROPumpData.h" +#include "VFPPressuresData.h" +#include "VFPLevelData.h" +#include "VFPFlowData.h" +#include "VFPConductivityData.h" +#include "VFPTemperatureData.h" +#include "VFPBoostPumpData.h" +#include "VFPRORejectionPercentageData.h" // ----- #include "VTreatmentCreate.h" +#include "VTreatmentIsolatedUFData.h" // ----- In-Treatment Adjustments -#include "VTreatmentAdjustmentDuration.h" +#include "VTreatmentAdjustmentBloodPrime.h" +#include "VTreatmentAdjustmentDurationEdit.h" +#include "VTreatmentAdjustmentDurationConfirm.h" #include "VTreatmentAdjustmentFlows.h" #include "VTreatmentAdjustmentUltrafiltrationState.h" #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" #include "VTreatmentAdjustmentSaline.h" +#include "VTreatmentAdjustmentVitals.h" #include "VTreatmentAdjustmentHeparin.h" #include "VTreatmentAdjustmentRinseback.h" #include "VTreatmentAdjustmentRecirculate.h" #include "VTreatmentAdjustmentPressuresLimits.h" +#include "VTreatmentAdjustmentPressuresWidening.h" +#include "VTreatmentAdjustmentBloodFlowRate.h" +#include "VTreatmentAdjustmentBolusVolume.h" +#include "VTreatmentAdjustmentDialysateFlowRate.h" +#include "VTreatmentAdjustmentDialysateTemperature.h" +#include "VTreatmentAdjustmentDurationConfirm.h" +#include "VTreatmentAdjustmentDurationEdit.h" +#include "VTreatmentAdjustmentIsolatedUFConfirm.h" +#include "VTreatmentAdjustmentIsolatedUFDurationEdit.h" +#include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h" +#include "VTreatmentAdjustmentSetPoints.h" +#include "VTreatmentAdjustmentVitalsAlarmLimits.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" @@ -175,7 +207,7 @@ { //using namespace View; qmlRegisterType ("Gui.View" , 0, 1, "GuiView"); - qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "GuiActions" , QStringLiteral("Used only for enumerations no need to have an object")); + qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "guiActions" , QStringLiteral("Used only for enumerations no need to have an object")); qmlRegisterSingletonType ("Gui.VEventSpy", 0, 1, "GuiEventSpy", [](QQmlEngine *, QJSEngine *) -> QObject * { return &_VEventSpy; });