Index: sources/applicationcontroller.h =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rb9c5b0b3afc3b34d4980ecc4f023f498f80dafbc --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision b9c5b0b3afc3b34d4980ecc4f023f498f80dafbc) @@ -1,6 +1,6 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. * \copyright \n * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n * IN PART OR IN WHOLE, \n @@ -15,53 +15,66 @@ // Qt #include -#include // Project #include "main.h" -#include "guiactions.h" -#include "filehandler.h" +#include "guiglobals.h" #include "applicationpost.h" -#include "canbus/caninterface.h" - // define #define _ApplicationController ApplicationController::I() // namespace -using namespace Storage; using namespace Gui; -using namespace Can; class ApplicationController : public QObject { Q_OBJECT - FileHandler *_fileHandler = nullptr; ApplicationPost *_applicationPost = nullptr; -SINGLETON_DECL(ApplicationController) -public: + QThread *_thread = nullptr; + bool _init = false; + +// Singleton +SINGLETON(ApplicationController) + +public slots: bool init(); + bool init(QThread &vThread); +private slots: + void quit(); + private: - void connection(); + void initConnections(); + void initThread(QThread &vThread); + void quitThread(); + + void keepAlive(); + private slots: // Should be private for thread safety and is connected internally. - void onActionRequest (GuiActionType vAction); // UI => HD/DG - void onActionConfirm (GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG + void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG - void onActionCommand (GuiActionType vAction); // UI <= HD/DG - void onActionPerform (GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void onMainTimerTimeout(); -signals: - void didActionRequest(GuiActionType vAction ); // UI => HD/DG - void didActionConfirm(GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG + void onUSBDriveMount (); + void onUSBDriveUmount(); + void onUSBDriveRemove(); - void didActionCommand(GuiActionType vAction ); // UI <= HD/DG - void didActionPerform(GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void onExportLog (); + void onExport (); - void quit(int retcode=0); +signals: + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void didUSBDriveMount (); + void didUSBDriveUmount(); + void didUSBDriveRemove(); + + void didExport (); };