Index: sources/gui/guiglobals.cpp =================================================================== diff -u -rf623529d6ec25b555f3ac2248d71fc2b5e7063d6 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision f623529d6ec25b555f3ac2248d71fc2b5e7063d6) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision feb3423b373dc2a2c4267ef9fcb4d924d738423d) @@ -1,6 +1,6 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. * copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, * IN PART OR IN WHOLE, @@ -17,24 +17,40 @@ #include // Project -#include "guiactions.h" +#include "logger.h" #include "guiview.h" namespace Gui { QQuickView *_viewer = nullptr; + /*! + * \brief registerTypes + * \details registering meta types + */ void registerTypes() { - qRegisterMetaType ("GuiActionType"); - qRegisterMetaType ("GuiActionInfo"); + qRegisterMetaType ("GuiActionType" ); + qRegisterMetaType ("GuiActionData" ); + qRegisterMetaType ("GuiActionIndx" ); + + qRegisterMetaType ("GuiAlarmID" ); + qRegisterMetaType ("GuiAlarmPriority"); } + /*! + * \brief registerQmlTypes + * \details registering QML types + */ void registerQmlTypes() { - qmlRegisterType ("Gui.View", 0, 1, "GuiView"); - qmlRegisterUncreatableType ("Gui.Actions", 0, 1, "GuiActions",QStringLiteral("Used only for enumerations no need to have an object")); + qmlRegisterType ("Gui.View" , 0, 1, "GuiView"); + qmlRegisterUncreatableType ("Gui.Actions", 0, 1, "GuiActions", QStringLiteral("Used only for enumerations no need to have an object")); } + /*! + * \brief startGui + * \details the GUI initializer/starter function + */ void startGui() { _viewer = new QQuickView; registerTypes(); @@ -46,7 +62,9 @@ _viewer->show(); } else if (vStatus == QQuickView::Error || vStatus == QQuickView::Null) { - // qDebug() << "Application Terminated:" << _viewer->errors(); + for (const auto &error : _viewer->errors()) { + LOG_ERROR(QObject::tr("Application Terminated: %1").arg(error.toString())); + } QCoreApplication::exit(-1); }