Index: sources/applicationcontroller.h =================================================================== diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -r846a9ebc350e33be4affab3cc4c136248900015d --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 595ed1fbe8066960afd4c8fea168208e81b173d9) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 846a9ebc350e33be4affab3cc4c136248900015d) @@ -1,14 +1,15 @@ /*! * * Copyright (c) 2019-2020 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 - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * \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 applicationcontroller.h - * \date 2019/09/30 - * \author Behrouz NematiPour + * \file applicationcontroller.h + * \author (last) Behrouz NematiPour + * \date (last) 25-Aug-2020 + * \author (original) Behrouz NematiPour + * \date (original) 24-Sep-2019 * */ #pragma once @@ -20,21 +21,29 @@ #include "main.h" #include "guiglobals.h" #include "applicationpost.h" -#include "mmodel.h" +#include "MModel.h" +#include "messageglobals.h" +#include "mtreatmentparameters.h" // define #define _ApplicationController ApplicationController::I() +// forward declarations +class tst_initializations; + // namespace using namespace Gui; +using namespace Can; - class ApplicationController : public QObject { Q_OBJECT - ApplicationPost *_applicationPost = nullptr; + // friends + friend class ::tst_initializations; + ApplicationPost *_applicationPost = nullptr; + QThread *_thread = nullptr; bool _init = false; @@ -59,20 +68,24 @@ void createFakeSequencedLongMessage (QVariantList &vData, const int vFakeDataLen); void createFakeSeqAtBeginLongMessage(QVariantList &vData, const int vFakeDataLen); + void saveNewTreatment(QJsonObject obj); + private slots: // Should be private for thread safety and is connected internally. - void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG - void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG - void onMainTimerTimeout(); + void onMainTimerTimeout(); void onUSBDriveMount (); void onUSBDriveUmount(); void onUSBDriveRemove(); + void onSDCardStateChange(bool vIsReady, bool vIsReadOnly); + void onExportLog (); void onExport (); - ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS + void onFailedTransmit(Sequence seq); signals: void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG @@ -82,6 +95,15 @@ void didUSBDriveUmount(); void didUSBDriveRemove(); + void didSDCardStateChange(bool vIsReady, bool vIsReadOnly); + void didExport (); -}; + void didAdjustBloodDialysateFlows(quint32 vBloodFlow, quint32 vDialysateFlow); + void didAdjustDuration(quint32 vDuration); + void didFailedTransmit(Sequence seq); + + // ---- Signal/Slots + ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS + ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS +};