Index: main.cpp =================================================================== diff -u -r5963f00ffd2c557d3ae06a5deea05032a3a3bd68 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d --- main.cpp (.../main.cpp) (revision 5963f00ffd2c557d3ae06a5deea05032a3a3bd68) +++ main.cpp (.../main.cpp) (revision feb3423b373dc2a2c4267ef9fcb4d924d738423d) @@ -36,6 +36,7 @@ #include "applicationcontroller.h" #include "guicontroller.h" #include "logger.h" +#include "usbwatcher.h" #ifdef UNIT_TEST #include TEST_CLASS_INCLUDE @@ -51,17 +52,17 @@ //! - Qt Application initialization and parameters settings // Qt Core Application parameters settings - // Qt Core Application Initialization - QApplication app(argc, argv); - app.thread()->setObjectName("Main Thread"); - qDebug() << app.thread()->objectName(); QApplication::setApplicationName(QLatin1String("Denali")); QApplication::setOrganizationName(QLatin1String("Diality Inc.")); //! - Check the required font(s) present and can be loaded QApplication::setFont(QFont("Barlow")); + // Qt Core Application Initialization + QApplication app(argc, argv); + app.thread()->setObjectName("Main Thread"); + // Test code for debugging can messages bool _consoleoutFrameInterface = false; bool _consoleoutCanInterface = false; @@ -90,38 +91,30 @@ app.installTranslator(&translator); } + //! - Initializing USB Watcher + _USBWatcher->init(); + //! - Initializing File Handler _FileHandler->init(); //! - Initializing Logger - //QThread _Logger_Thread; - //_Logger_Thread.setObjectName("Logger Thread"); _Logger->init(); - //_Logger->moveToThread(&_Logger_Thread); - //QObject::connect(&_Logger_Thread, SIGNAL(finished()), _Logger, SLOT(deleteLater())); - //_Logger_Thread.start(); LOG_EVENT(QObject::tr("Application Started")); //! - Initializing Main Timer _MainTimer->init(); - LOG_EVENT(QObject::tr("Main Timer Initialized")); //! - Initializing CanBus Interface _CanInterface->init(); _CanInterface->enableConsoleOut(_consoleoutCanInterface); - LOG_EVENT(QObject::tr("CanInterface Initialized")); - LOG_EVENT(QObject::tr("console out CanInterface %1").arg(_consoleoutCanInterface)); //! - Initializing CanBus Message Handler _FrameInterface->init(); - LOG_EVENT(QObject::tr("FrameInterface Initialized")); //! - Initializing CanBus Message Dispatcher _MessageDispatcher->init(); _MessageDispatcher->enableConsoleOut(_consoleoutFrameInterface); - LOG_EVENT(QObject::tr("MessageDispatcher Initialized")); - LOG_EVENT(QObject::tr("console out MessageDispatcher %1").arg(_consoleoutFrameInterface)); //! - Initializing Application Controller _ApplicationController->init(); @@ -136,11 +129,12 @@ ////! - Initializing GUI Controller _GuiController->init(); - LOG_EVENT(QObject::tr("Gui Controller Initialized")); //! - Initialize the Qml Viewer and starts GUI startGui(); - return app.exec(); + int app_exec = app.exec(); + + return app_exec; } #endif