Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -1,31 +1,36 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file GuiGlobals.cpp - * \author (last) Peter Lucia - * \date (last) 15-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 26-Aug-2020 + * \file GuiGlobals.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 26-Aug-2020 * */ #include "GuiGlobals.h" // Qt +#include #include // Project #include "Logger.h" #include "GuiView.h" #include "VEventSpy.h" +#include "VGeneralEvent.h" // POST #include "VHDPOSTData.h" #include "VDGPOSTData.h" +// Confirm +#include "VConfirm.h" + // Device #include "DeviceView.h" @@ -35,12 +40,13 @@ #include "VSettings.h" #include "VAlarmStatus.h" #include "VAlarmActiveList.h" -#include "VPowerOff.h" #include "VAdjustmentVersions.h" -#include "VAdjustmentService.h" +#include "VAdjustmentServiceMode.h" +#include "VAdjustmentServiceDates.h" #include "VDateTime.h" #include "VNetworkModel.h" #include "VAdjustmentAlarmVolume.h" +#include "VBluetooth.h" // states data #include "VHDOperationModeData.h" #include "VPreTreatmentStatesData.h" @@ -75,8 +81,12 @@ #include "VTreatmentRinsebackData.h" #include "VTreatmentRecirculateData.h" #include "VTreatmentBloodPrimeData.h" +#include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" #include "VHDSyringePumpData.h" +#include "VHDBloodLeakData.h" +#include "VHDAirBubbleData.h" +#include "VHDAirTrapData.h" // DG data #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" @@ -88,6 +98,7 @@ #include "VDGTemperaturesData.h" #include "VDGValvesStatesData.h" #include "VDGAccelerometerData.h" +#include "VDGConductivityData.h" // ----- #include "VTreatmentCreate.h" // ----- In-Treatment Adjustments @@ -164,7 +175,7 @@ registerQmlTypes(); QObject::connect(_viewer, &MainView::statusChanged, qApp, [=](MainView::Status vStatus) { - // coco begin validated: this portion of the code is handling application initialization + // disabled coco begin validated: this portion of the code is handling application initialization // and if not initialized correctly will terminate the application . // So it had been manually tested. bool ok = vStatus == MainView::Ready; @@ -177,10 +188,12 @@ } QCoreApplication::exit(-1); } - // coco end + // disabled coco end }, Qt::QueuedConnection ); LOG_DEBUG("MainView Starting"); + _viewer->engine()->addImportPath("qrc:/plugins"); + //DEBUG: qDebug() << _viewer->engine()->importPathList(); _viewer->setSource(QStringLiteral("qrc:/main.qml")); LOG_DEBUG("MainView started"); return true;