Index: denali.pro.user =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- denali.pro.user (.../denali.pro.user) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ denali.pro.user (.../denali.pro.user) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,6 +1,6 @@ - + EnvironmentId Index: main.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- main.cpp (.../main.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ main.cpp (.../main.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -19,6 +19,10 @@ * This document has been generated by Doxygen.\n * This document describes the detail description of the UI Application Software design.\n * UI Application starts by Application Initialization which happens in \ref main.cpp "Initialization section".\n + * For information please see : + * - \subpage CommandLineSwitches + * - \subpage MessageFlow + * - \subpage MessageView */ // Qt @@ -76,26 +80,32 @@ bool gConsoleoutCanInterface = false ; /*! - * \brief commandlineParse - * \details parses the command line arguments \n - * Usage: ./denali [options] \n - * Denali \n - * \n - * Options: \n - * -h, --help Displays this help. \n - * -v, --version Displays version information. \n - * -c, --canOut Show the Can Frame Output \n - * -m, --msgOut Show the Message Output \n - * -0, --enable-keep-awake Enable send low priority, empty message on \n - * the CANBus just to keep UI board CAN driver \n - * awake \n - * -i, --fake-interval Test fake message interval(ms) \n - * -f, --fake-message Test fake message data \n - * will use default sequenced long fake message \n - * if set to 00(default) \n - * will used only if correct intger value \n - * assigned for interval option \n + * \page CommandLineSwitches Denali Command Line Switches + * \verbatim + * Usage: ./denali [options] + * Denali + * + * Options: + * -h, --help Displays this help. + * -v, --version Displays version information. + * -c, --canOut Show the Can Frame Output + * -m, --msgOut Show the Message Output + * -0, --enable-keep-awake Enable send low priority, empty message on + * the CANBus just to keep UI board CAN driver + * awake + * -i, --fake-interval Test fake message interval(ms) + * -f, --fake-message Test fake message data + * will use default sequenced long fake message + * if set to 00(default) + * will used only if correct integer value + * assigned for interval option + * \endverbatim */ +/*! + * \brief commandlineParse + * \details parses the command line arguments + * \ref CommandLineSwitches + */ void commandlineParse() { QCommandLineParser parser; parser.setApplicationDescription(QApplication::applicationName()); Index: sources/ApplicationController.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/ApplicationController.h (.../ApplicationController.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -18,10 +18,10 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove +#include "MModel.h" #include "GuiGlobals.h" #include "ApplicationPost.h" -#include "MModel.h" #include "MessageGlobals.h" // define @@ -34,10 +34,21 @@ using namespace Gui; using namespace Can; +/*! + * \brief The ApplicationController class + * \details Singleton class which is the main gateway of all signal/slots. + * This class is the main gate keeper for decisions and will decide if a message should pass through the other observers. + * Currently (08/30/2020) is a bridge and will pass all the messages. + * Later with implementation/help of the main state machine will decide on the state of the device what needs to be done. + * \note States are like [Idle, Out of Battery, Fault, FW connection lost] and such + */ class ApplicationController : public QObject { Q_OBJECT + // Singleton + SINGLETON(ApplicationController) + // friends friend class ::tst_initializations; @@ -46,9 +57,6 @@ QThread *_thread = nullptr; bool _init = false; -// Singleton -SINGLETON(ApplicationController); - public slots: bool init(); bool init(QThread &vThread); Index: sources/MainTimer.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 maintimer.cpp + * \file MainTimer.cpp * \author (last) Behrouz NematiPour * \date (last) 13-Apr-2020 * \author (original) Behrouz NematiPour Index: sources/MainTimer.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/MainTimer.h (.../MainTimer.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/MainTimer.h (.../MainTimer.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 maintimer.h + * \file MainTimer.h * \author (last) Behrouz NematiPour * \date (last) 15-Jan-2020 * \author (original) Behrouz NematiPour @@ -18,7 +18,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove // Define #define _MainTimer MainTimer::I() @@ -31,10 +31,11 @@ { Q_OBJECT + // Singleton + SINGLETON(MainTimer) + static const int _interval = 1000; //ms -// Singleton -SINGLETON(MainTimer); public: bool init(); void quit(); @@ -46,5 +47,5 @@ void didDateChange(); protected: - void timerEvent(QTimerEvent *) override; + void timerEvent(QTimerEvent *) override; }; Index: sources/Threads.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/Threads.cpp (.../Threads.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/Threads.cpp (.../Threads.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 threads.cpp + * + * \file Threads.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 07-Jan-2020 - * + * */ #include "Threads.h" Index: sources/Threads.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/Threads.h (.../Threads.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/Threads.h (.../Threads.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 threads.h + * + * \file Threads.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 07-Jan-2020 - * + * */ #pragma once Index: sources/canbus/CanInterface.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "MessageGlobals.h" @@ -46,6 +46,9 @@ { Q_OBJECT + // Singleton + SINGLETON(CanInterface) + // friends friend class ::tst_canbus; friend class ::tst_acknow; @@ -67,9 +70,6 @@ FrameCount _txFrameCount = 0; FrameCount _erFrameCount = 0; -// Singleton -SINGLETON(CanInterface); - public slots: bool init(); bool init(QThread &vThread); Index: sources/canbus/FrameInterface.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "MessageGlobals.h" // Define @@ -44,6 +44,9 @@ { Q_OBJECT + // Singleton + SINGLETON(FrameInterface) + // friends friend class ::tst_canbus; friend class ::tst_acknow; @@ -63,26 +66,23 @@ QThread *_thread = nullptr; bool _init = false; - struct Frame { - Can_Id can_Id; - QByteArray data ; + Can_Id can_Id; + QByteArray data ; - Frame(Can_Id vCan_Id, const QByteArray &vData) { - can_Id = vCan_Id; - data = vData ; - } - }; - QList _txFrameList; - const quint16 _txFrameList_Max = 4000; // maximum number of frames in the transmit buffer - bool _transmitted = false; + Frame(Can_Id vCan_Id, const QByteArray &vData) { + can_Id = vCan_Id; + data = vData ; + } + }; - const quint8 _interval = 7; // keep awake call of the UI board in ms + QList _txFrameList; + const quint16 _txFrameList_Max = 4000; // maximum number of frames in the transmit buffer + bool _transmitted = false; - QString _timestamp; + const quint8 _interval = 7; // keep awake call of the UI board in ms -// Singleton -SINGLETON(FrameInterface); + QString _timestamp; protected: void timerEvent(QTimerEvent *); Index: sources/canbus/MessageAcknowModel.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MessageGlobals.h" // Define @@ -108,6 +109,9 @@ { Q_OBJECT + // Singleton + SINGLETON(MessageAcknowModel) + friend class ::tst_acknow; typedef QHash AcknowList; @@ -116,9 +120,6 @@ QThread *_thread = nullptr; bool _init = false; -// Singleton -SINGLETON(MessageAcknowModel); - public slots: bool init(); bool init(QThread &vThread); Index: sources/canbus/MessageBuilder.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messagebuilder.h + * \file MessageBuilder.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messagedispatcher.cpp + * \file MessageDispatcher.cpp * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour @@ -194,6 +194,11 @@ framesTransmit(vCan_Id, vFrameList); } +/*! + * \brief MessageDispatcher::onFailedTransmit + * \details the slot which will be called on transmit failed on MessageAcknowModel + * \param vSequence + */ void MessageDispatcher::onFailedTransmit(Sequence vSequence) { // coco begin validated: Is a placeholder and has not been implemented yet Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messagedispatcher.h + * \file MessageDispatcher.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour @@ -18,7 +18,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "MessageBuilder.h" #include "MessageInterpreter.h" @@ -86,6 +86,9 @@ { Q_OBJECT + // Singleton + SINGLETON(MessageDispatcher) + // friends friend class ::tst_canbus; friend class ::tst_acknow; @@ -111,9 +114,6 @@ GuiActionType::ID_AlarmSilenceReq , }; -// Singleton -SINGLETON(MessageDispatcher); - public slots: bool init(); bool init(QThread &vThread); Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rda39155b9644400a654a22bc010d5d7fa3526716 -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision da39155b9644400a654a22bc010d5d7fa3526716) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messageglobals.h + * \file MessageGlobals.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messageinterpreter.cpp + * \file MessageInterpreter.cpp * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 messageinterpreter.h + * \file MessageInterpreter.h * \author (last) Behrouz NemaiPour * \date (last) 22-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/gui/GuiController.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 guicontroller.cpp + * \file GuiController.cpp * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/gui/GuiController.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiController.h (.../GuiController.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiController.h (.../GuiController.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 guicontroller.h + * \file GuiController.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour @@ -18,7 +18,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "GuiGlobals.h" #include "MModel.h" #include "MessageGlobals.h" @@ -31,16 +31,24 @@ // namespace namespace Gui { +/*! + * \brief The GuiController class + * \details Singleton class which is the main gateway of all signal/slots through GUI. + * This class is the Gui gate keeper for decisions and will decide if a message should pass through the other observers. + * Currently (08/30/2020) is a bridge and will pass all the messages. + * Later with implementation/help of the Gui state machine will decide on the state of the device what needs to be done. + * \note States are like [wait for user , user attention required , Time outs , ... ] + */ class GuiController : public QObject { Q_OBJECT + // singleton + SINGLETON(GuiController) + QThread *_thread = nullptr; bool _init = false; -// singleton -SINGLETON(GuiController); - public slots: bool init(); bool init(QThread &vThread); @@ -62,7 +70,6 @@ void doUSBDriveUmount(); // UI => OS void doExportLog (); // UI => OS - private slots: // Should be private for thread safety and is connected internally. void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 + * \file GuiGlobals.cpp * \author (last) Behrouz NemaiPour * \date (last) 12-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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.h + * \file GuiGlobals.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/gui/GuiView.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiView.cpp (.../GuiView.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiView.cpp (.../GuiView.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,16 +5,16 @@ * 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 guiview.cpp + * \file GuiView.cpp * \author (last) Behrouz NematiPour * \date (last) 21-May-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * */ -#include "GuiView.h" // Project +#include "GuiView.h" #include "GuiController.h" // namespace Index: sources/gui/GuiView.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/gui/GuiView.h (.../GuiView.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/gui/GuiView.h (.../GuiView.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 guiview.h + * \file GuiView.h * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour @@ -34,8 +34,8 @@ // coco begin validated: This needs user interaction to plug-in/out SD Card // has been tested manually - PROPERTY(bool, sdIsReady , false); - PROPERTY(bool, sdIsReadOnly, false); + PROPERTY(bool, sdIsReady , false) + PROPERTY(bool, sdIsReadOnly, false) // coco end public: Index: sources/main.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/main.h (.../main.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/main.h (.../main.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 main.h * \author (last) Peter Lucia * \date (last) 26-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 - * + * */ #pragma once @@ -33,6 +33,10 @@ vCLASS(vCLASS const &) = delete; \ vCLASS & operator = (vCLASS const &) = delete; \ public: \ + /*! \brief instance accessor + \details A singleton class single instance creator/accessor + \return reference to the class static instance + */\ static vCLASS &I() { \ static vCLASS _instance; \ return _instance; \ @@ -50,46 +54,75 @@ //--------------------------------------------------------------------------------// #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; //--------------------------------------------------------------------------------// -#define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ - protected : \ - void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ - static bool init = false; \ - if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ - DEBUG_PROPERTY_CHANGED(vVARIABLE) \ - init = true; \ - _##vVARIABLE = v##vVARIABLE; \ - emit vVARIABLE##Changed( _##vVARIABLE ); \ - } \ +#define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ + protected : \ + /*! \brief Property setter + \details The property setter which update the private variable \n + - if only the value has been changed \n + - or it's the first time property is set. \n + emits the Property notify (...Changed) signal on update. \n + the notify signal (...Changed) passes the new value as its parameter. \n + \param new value + */\ + void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ + static bool init = false; \ + if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + init = true; \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Changed( _##vVARIABLE ); \ + } \ } //--------------------------------------------------------------------------------// -#define TRIGGER_SLOT( vTYPE , vVARIABLE ) \ - protected: \ - void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ - DEBUG_PROPERTY_CHANGED(vVARIABLE) \ - _##vVARIABLE = v##vVARIABLE; \ - emit vVARIABLE##Triggered( _##vVARIABLE ); \ +#define TRIGGER_SLOT( vTYPE , vVARIABLE ) \ + protected: \ + /*! \brief Trigger setter + \details The Trigger setter which update the private variable \n + with no condition each time the value the passed. \n + emits the Trigger notify (...Triggered) signal after update. \n + the notify signal (...Triggered) passes the new value as its parameter.\n + \param new value + */\ + void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ + DEBUG_PROPERTY_CHANGED(vVARIABLE) \ + _##vVARIABLE = v##vVARIABLE; \ + emit vVARIABLE##Triggered( _##vVARIABLE ); \ } //--------------------------------------------------------------------------------// -#define PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, vSIGNAL) \ - Q_PROPERTY( vTYPE vVARIABLE \ - READ vVARIABLE \ - WRITE vVARIABLE \ - NOTIFY vVARIABLE##vSIGNAL) \ - Q_SIGNALS: \ - void vVARIABLE##vSIGNAL( const vTYPE & v##vVARIABLE ); \ - private: \ - vTYPE _##vVARIABLE = vDEFVALUE; \ - protected: \ - vTYPE vVARIABLE () const { \ - return _##vVARIABLE ; \ - } +#define PROPERTY_BASE(vTYPE , vVARIABLE , vDEFVALUE, vSIGNAL) \ + /*! \brief Qt Property declaration + \details The Qt Property definition by Q_PROPERTY documentation. + */\ + Q_PROPERTY( vTYPE vVARIABLE \ + READ vVARIABLE \ + WRITE vVARIABLE \ + NOTIFY vVARIABLE##vSIGNAL) \ + Q_SIGNALS: \ + /*! \brief Property notify signal + \details The Property notify signal (...Changed) + which will be emitted by Property setter. + \return current value + */\ + void vVARIABLE##vSIGNAL( const vTYPE & v##vVARIABLE ); \ + private: \ + vTYPE _##vVARIABLE = vDEFVALUE; \ + protected: \ + /*! \brief Property getter + \details The Property getter which reads the private variable + \return current value + */\ + vTYPE vVARIABLE () const { \ + return _##vVARIABLE ; \ + } //--------------------------------------------------------------------------------// -#define PROPERTY( vTYPE , vVARIABLE , vDEFVALUE ) \ - PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Changed ) \ +#define PROPERTY( vTYPE , vVARIABLE , vDEFVALUE ) \ + \ + PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Changed ) \ PROPERTY_SLOT( vTYPE , vVARIABLE) //--------------------------------------------------------------------------------// -#define TRIGGER( vTYPE , vVARIABLE , vDEFVALUE ) \ - PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Triggered) \ +#define TRIGGER( vTYPE , vVARIABLE , vDEFVALUE ) \ + \ + PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Triggered) \ TRIGGER_SLOT( vTYPE , vVARIABLE) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// @@ -114,53 +147,91 @@ //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_PRIVATE_SLOT(vTYPE) \ private Q_SLOTS: \ + /*! \brief Bridge slot + \details The bridge slot is for thread safety between classes for received message + and is used to emit its signal to pass the model data to next observer. + \param vData - The model data which has been received. + \note This method is private and the interface is signals only. (starts with 'on') + */\ void onActionReceive (const vTYPE &vData) { \ emit didActionReceive(vData); \ } //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION(vTYPE) \ private Q_SLOTS: \ + /*! \brief Adjustment slot + \details The bridge slot is for thread safety between classes for adjustment messages + and is used to emit its signal to pass the model data to next observer. + \param vData - The model data to be used for adjustment + \note This method is private and the interface is signals only. (starts with 'on') + This slot has to have its specific implementation and is not a bridge (not a signal emitter). + */\ void onAdjustment (const vTYPE &vData); //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PRIVATE_SLOT(vTYPE) \ private Q_SLOTS: \ + /*! \brief Adjustment bridge slot + \details The bridge slot is for thread safety between classes for adjustment messages + and is used to emit its signal to pass the model data to next observer. + \param vData - The model data to be used for adjustment + \note This method is private and the interface is signals only. (starts with 'on') + */\ void onAdjustment (const vTYPE &vData) { \ emit didAdjustment( vData); \ } //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_PUBLIC_SLOT(vTYPE) \ public Q_SLOTS: \ + /*! \brief Adjustment invocable/exposed slot + \details This slot is able to be called within QML context + when an object of the class is instantiated in QML. + For thread safety it's calling its designated signal to notify observers. + \note This method is public and is the interface. (starts with 'do') + */\ void doAdjustment (const vTYPE &vData) { \ emit didAdjustment( vData); \ } //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_SIGNAL(vTYPE) \ Q_SIGNALS: \ + /*! \brief Receive bridge signal + \details The bridge signal is for thread safety between classes for received message + and is used to be emitted in its slot to pass the model data to next observer. + \param vData - The model data which has been received. + \note This method is public to be exposed to the observers to be able to connect to it as the interface. (starts with 'did') + */\ void didActionReceive (const vTYPE &vData); //--------------------------------------------------------------------------------// -#define ACTION_TRANSMT_SIGNAL(vTYPE) \ -Q_SIGNALS: \ - void didActionTransmit(const vTYPE &vData); -//--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_SIGNAL(vTYPE) \ Q_SIGNALS: \ + /*! \brief Adjustment bridge signal + \details The bridge signal is for thread safety between classes for received message + and is used to be emitted in its slot to pass the model data to next observer. + \param vData - The model data which has been received. + \note This method is public to be exposed to the observers to be able to connect to it as the interface. (starts with 'did') + */\ void didAdjustment (const vTYPE &vData); //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_BRIDGE_DEFINITION(vTYPE) \ + \ ACTION_RECEIVE_PRIVATE_SLOT (vTYPE) \ - ACTION_RECEIVE_SIGNAL (vTYPE) + ACTION_RECEIVE_SIGNAL (vTYPE) \ //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(vTYPE) \ + \ ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) + ADJUST_TRANSMT_SIGNAL (vTYPE) \ //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_BRIDGE_DEFINITION(vTYPE) \ + \ ADJUST_TRANSMT_PRIVATE_SLOT (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) + ADJUST_TRANSMT_SIGNAL (vTYPE) \ //--------------------------------------------------------------------------------// #define ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(vTYPE) \ + \ ADJUST_TRANSMT_PUBLIC_SLOT (vTYPE) \ - ADJUST_TRANSMT_SIGNAL (vTYPE) + ADJUST_TRANSMT_SIGNAL (vTYPE) \ + //--------------------------------------------------------------------------------// #define REGISTER_METATYPE(vTYPE) \ qRegisterMetaType < vTYPE > (#vTYPE); Index: sources/model/MDGDebugText.cpp =================================================================== diff -u -r618891879f5cdc68e37ee68eea005afb76dd4e5b -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/MDGDebugText.cpp (.../MDGDebugText.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) +++ sources/model/MDGDebugText.cpp (.../MDGDebugText.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDebugText.h + * \file MDGDebugText.h * \date 7/9/2020 * \author Behrouz NematiPour * Index: sources/model/MDGDebugText.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/model/MDGDebugText.h (.../MDGDebugText.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDebugText.h + * \file MDGDebugText.h * \date 7/9/2020 * \author Behrouz NematiPour * Index: sources/model/MHDDebugText.cpp =================================================================== diff -u -r618891879f5cdc68e37ee68eea005afb76dd4e5b -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision 618891879f5cdc68e37ee68eea005afb76dd4e5b) +++ sources/model/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDebugText.h + * \file MHDDebugText.h * \date 7/9/2020 * \author Behrouz NematiPour * Index: sources/model/MHDDebugText.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/model/MHDDebugText.h (.../MHDDebugText.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDebugText.h + * \file MHDDebugText.h * \date 7/9/2020 * \author Behrouz NematiPour * Index: sources/model/MModel.h =================================================================== diff -u -ree50b509107a743f6133a33371e18646ff9c10b2 -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/MModel.h (.../MModel.h) (revision ee50b509107a743f6133a33371e18646ff9c10b2) +++ sources/model/MModel.h (.../MModel.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file models.h + * \file MModel.h * \date 3/4/2020 * \author Behrouz NematiPour * @@ -52,17 +52,51 @@ #include "MTreatmentAdjustSalineResponse.h" /*! - * \brief Message interpretation instruction - * \details This comment explains how to add a Denali Message in Denali UI Application + * \page MessageFlow Message interpretation Flow + * \dot + * digraph callgraph { + * node [shape=ellipse, fontname=Arial, fontsize=11]; + * user [shape=box ]; + * QML [URL="\ref application/sources/gui" ]; + * GuiView [URL="\ref Gui::GuiView" ]; + * View [URL="\ref application/sources/view" ]; + * GuiController [URL="\ref Gui::GuiController" ]; + * ApplicationController [URL="\ref ApplicationController" ]; + * MessageDispatcher [URL="\ref Can::MessageDispatcher" ]; + * MessageAcknow [URL="\ref Can::MessageAcknowModel" ]; + * MessageInterpreter [URL="\ref Can::MessageInterpreter" ]; + * MessageBuilder [URL="\ref Can::MessageBuilder" ]; + * FrameInterface [URL="\ref Can::FrameInterface" ]; + * CanInterface [URL="\ref Can::CanInterface" ]; + * CANBus [shape=box ]; + * user -> QML [dir="both" ]; + * QML -> { GuiView, } [dir="both" ]; + * { GuiView, } -> GuiController [dir="both" ]; + * GuiController -> ApplicationController [dir="both" ]; + * ApplicationController -> MessageDispatcher [dir="both" ]; + * MessageDispatcher -> MessageInterpreter [dir="both" ]; + * MessageDispatcher -> MessageAcknow ; + * MessageInterpreter -> MessageBuilder [dir="both" ]; + * MessageBuilder -> FrameInterface [dir="both" ]; + * FrameInterface -> CanInterface [dir="both" ]; + * CanInterface -> CANBus [dir="both" ]; + * } + * \enddot + * \note This instruction needs to be reviewed. + * \details + * This comment explains how to add a Denali Message in Denali UI Application * * 1 - Look at the message structure in the "message list.xlsx" * * 2 - MSG ID : * Add an enum for the message in the guiglobals.h : GuiActionsType_Enum * and assign a correct message value to it. * example : MSG ID = 9 => + * * \code{.cpp} + * * PressureOcclusion = 0x0900, //(little endian) + * * \endcode * * 3 - MSG Payload Len : @@ -81,10 +115,15 @@ * example : be careful about the type. * in the header should be like: * \code{.cpp} + * \n * bool pressureOcclusionData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + * \n * \endcode + * * in the implementation should be like: + * * \code{.cpp} + * \n * bool MessageInterpreter::pressureOcclusionData(const Message &vMessage, QVariantList &vData) * { * // TODO : review other methods @@ -101,22 +140,28 @@ * * return ok; * } + * \n * \endcode * * Add a case in MessageInterpreter::interpretMessage_HD for that message id Enum * with lines like : + * * \code{.cpp} + * \n * case Gui::GuiActionType::PressureOcclusion: * ok = pressureOcclusionData (vMessage, vData); * break; + * \n * \endcode * */ - //--------------------------------------------------------------------------------// //-------- Please add the model type to the lists below to register them ---------// //--------------------------------------------------------------------------------// +/*! + */ #define REGISTER_MODEL_METATYPES \ + \ REGISTER_METATYPE( BloodFlowData ) \ REGISTER_METATYPE( DialysateFlowData ) \ REGISTER_METATYPE( OutletFlowData ) \ @@ -144,7 +189,7 @@ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ - /* Request */ \ + /* Request */ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ @@ -157,10 +202,11 @@ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ - REGISTER_METATYPE( AdjustSalineResponseData ) + REGISTER_METATYPE( AdjustSalineResponseData ) \ //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, OutletFlowData ) \ @@ -193,17 +239,21 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ + // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ + \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( OutletFlowData ) \ @@ -236,25 +286,30 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) -// /* Request */ ---------------------------------------------------------// + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ + + #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ + /* Request --------------------------------------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) -// /* Request */ ----------------------- NoEmit --------------------------// + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ + + #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ + /* Request ----------------------- NoEmit -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) -// /* Request */ ----------------------- public --------------------------// + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ + #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ + /* Request ----------------------- public -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ @@ -263,6 +318,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ + /* Received signals */ \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ ACTION_RECEIVE_SIGNAL( OutletFlowData ) \ Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MDGROPump.h + * \file MDGROPumpData.h * \date 7/1/2020 * \author Behrouz NematiPour * Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file mtreatmentadjustrequests.h + * \file MTreatmentAdjustRequests.h * \date 2020/06/08 * \author Behrouz NematiPour * @@ -15,7 +15,7 @@ #pragma once // Qt -#include +#include //project #include "GuiGlobals.h" @@ -30,8 +30,6 @@ * Otherwise the parameters are so tiny models. */ -#include - class MModel { protected: static QString toString (const QString &vStringPrefix, const QVariant &vParameters) { Index: sources/storage/DriveWatcher.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/DriveWatcher.h (.../DriveWatcher.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/DriveWatcher.h (.../DriveWatcher.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "Threads.h" // Define @@ -38,6 +38,9 @@ { Q_OBJECT + // Singleton + SINGLETON(DriveWatcher) + // friends friend class ::tst_initializations; @@ -52,9 +55,6 @@ QThread *_thread = nullptr; bool _init = false; -// Singleton -SINGLETON(DriveWatcher); - public slots: bool init(); bool init(QThread &vThread); Index: sources/storage/FileHandler.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/FileHandler.h (.../FileHandler.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/FileHandler.h (.../FileHandler.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 filehandler.h + * \file FileHandler.h * \author (last) Behrouz NematiPour * \date (last) 02-Apr-2020 * \author (original) Behrouz NematiPour Index: sources/storage/Logger.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 logger.cpp + * \file Logger.cpp * \author (last) Behrouz NematiPour * \date (last) 13-Apr-2020 * \author (original) Behrouz NematiPour Index: sources/storage/Logger.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/Logger.h (.../Logger.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/Logger.h (.../Logger.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 logger.h + * \file Logger.h * \author (last) Behrouz NematiPour * \date (last) 04-Feb-2020 * \author (original) Behrouz NematiPour @@ -20,7 +20,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove #include "StorageGlobals.h" @@ -57,6 +57,9 @@ { Q_OBJECT + // Singleton + SINGLETON(Logger) + // friends friend class ::tst_logging; @@ -120,8 +123,6 @@ QThread *_thread = nullptr; bool _init = false; -// Singleton -SINGLETON(Logger); public slots: bool init(); @@ -137,13 +138,13 @@ void quitThread(); private: -// ----- setting up + // ----- setting up void checkLogPath (); void setLogBasePath (bool vUseApplicationDirPath = false); bool setLogPath (); bool setLogPath (LogType vLogType); -// ----- Export structure + // ----- Export structure private : bool exportLogs(); public slots: // this slot is thread safe and can be called from outside by LOG_EXPORT. @@ -152,7 +153,7 @@ signals: void didExportLogs(); -// ----- Remove Old Logs structure + // ----- Remove Old Logs structure private: int removeLogs(); private slots: // this slot is thread safe and can be called from outside but preferred not to. @@ -161,12 +162,12 @@ signals: void didRemoveLogs(); -// ----- Available space is low + // ----- Available space is low private slots: void onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent); -// ----- logging structure + // ----- logging structure private slots: void onLog (const QString &vContent, LogType vLogType); private: Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 storageglobals.cpp + * + * \file StorageGlobals.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 02-Jan-2020 - * + * */ #include "StorageGlobals.h" Index: sources/storage/StorageGlobals.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 storageglobals.h + * + * \file StorageGlobals.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 02-Jan-2020 - * + * */ #pragma once Index: sources/view/VEventSpy.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -116,8 +116,8 @@ /*! * \brief VEventSpy::touchEventSpy - * \param vEvent - * \param typeName + * \param vEvent - General event type which will be cast to QTouchEvent + * \param typeName - The type of the QEvent which has been shortened e.g. tB: TouchBegin */ // coco begin validated: this code has been manually tested. // the only intention of this code is to be used for EMC testing and has been tested and is working fine. Index: sources/view/VEventSpy.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/VEventSpy.h (.../VEventSpy.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/VEventSpy.h (.../VEventSpy.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" +#include "main.h" // Doxygen : don't remove // define #define _VEventSpy View::VEventSpy::I() @@ -31,15 +31,15 @@ Q_OBJECT // singleton - SINGLETON(VEventSpy); + SINGLETON(VEventSpy) // coco begin validated: this code has been manually tested. // the only intention of this code is to be used for EMC testing and has been tested and is working fine. - PROPERTY( quint64 , touchCount , 0 ); - PROPERTY( quint64 , touchPoints , 0 ); + PROPERTY( quint64 , touchCount , 0 ) + PROPERTY( quint64 , touchPoints , 0 ) - PROPERTY( quint64 , mouseCount , 0 ); - PROPERTY( QPoint , mousePoint , QPoint() ); + PROPERTY( quint64 , mouseCount , 0 ) + PROPERTY( QPoint , mousePoint , QPoint() ) // coco end private: Index: sources/view/VPowerOff.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/VPowerOff.cpp (.../VPowerOff.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/VPowerOff.cpp (.../VPowerOff.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vpoweroff.cpp + * + * \file VPowerOff.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "VPowerOff.h" Index: sources/view/VPowerOff.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/VPowerOff.h (.../VPowerOff.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/VPowerOff.h (.../VPowerOff.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vpoweroff.h + * \file VPowerOff.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -32,7 +33,7 @@ // to be always trigger the GUI // also since the signal passe parameter value is used the property getter in not currently used. // manually tested and all of them are working. - TRIGGER( quint8, poweroff, 0); + TRIGGER( quint8, poweroff, 0) // coco end VIEW_DEC(VPowerOff, PowerOffData) Index: sources/view/VView.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/VView.h (.../VView.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/VView.h (.../VView.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -15,42 +15,52 @@ #pragma once /*! - * \brief Denali Message UI usage instruction + * \page MessageView Denali Message UI usage instruction * \details This comment explains how to use a Denali Message populated data in Denali UI Application - * + * \verbatim * 1 - Look at the message structure in the "message list.xlsx" * * 2 - View Implementation : - * Implement a view like VPressureOcclusion by copy/paste the closest model .h/.cpp file + * Implement a view like VDGPressures by copy/paste the closest model .h/.cpp file * and adding it to project and modify to fit the new model. * * 3 - Register View : - * Add the required lines like the other models in the vview.h file. - * Also add the #include in the guiglobals.cpp + * - Add the required lines like the other models in the VView.h file. + * - Also add the #include in the GuiGlobals.cpp * * 4 - Usage in UI : - * Import : import VTreatmentPressureOcclusion 0.1; - * Instantiate : VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } - * Access : value: vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure - * + * Import : import VDGPressures 0.1; + * Instantiate : VDGPressures { id: vDGPressures } + * Access : value: vDGPressures.drainInletPSI + * \endverbatim */ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// // The child declaration in header #define VIEW_DEC_CLASS(vCLASS) \ private: \ + /*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. + */\ void initConnections(); \ public: \ - explicit vCLASS(QObject *parent = nullptr); + /*! \brief Class Constructor + \details Only call initConnections to initialize the signal/slot connections. + \param parent - The QObject parent pointer which is passed as nullptr and is not set. + */\ + explicit vCLASS(QObject *parent = nullptr); \ //--------------------------------------------------------------------------------// #define VIEW_DEC_SLOT(vDATATYPE) \ private Q_SLOTS: \ - void onActionReceive (const vDATATYPE &vData); + /*! \brief Model data received message handler. + \details When signal received this method is called to update the view properties. + \param vData - Model data + */\ + void onActionReceive (const vDATATYPE &vData); \ //--------------------------------------------------------------------------------// #define VIEW_DEC(vCLASS, vDATATYPE) \ VIEW_DEC_CLASS(vCLASS) \ VIEW_DEC_SLOT(vDATATYPE) \ -private: //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// @@ -59,31 +69,30 @@ using namespace View; \ vCLASS::vCLASS(QObject *parent) : QObject(parent) { \ initConnections(); \ -} +} \ //--------------------------------------------------------------------------------// #define VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) \ void vCLASS::initConnections() { \ ACTION_RECEIVE_BRIDGE_CONNECTION( \ Gui::_GuiController, vDATATYPE); \ -} +} \ //--------------------------------------------------------------------------------// #define VIEW_DEF(vCLASS, vDATATYPE) \ VIEW_DEF_CLASS(vCLASS) \ - VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) + VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// // The Adjustment child definition in cpp -#define VIEW_DEC_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ - VIEW_DEC_CLASS(vCLASS) \ - VIEW_DEC_SLOT (vDATATYPE) +#define VIEW_DEC_CLASS_ADJUSTMENT(vCLASS, vDATATYPE)\ + VIEW_DEC_CLASS(vCLASS) \ + VIEW_DEC_SLOT(vDATATYPE) \ //--------------------------------------------------------------------------------// #define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ using namespace View; \ vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ initConnections(); \ - } - + } \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/view/dg/data/VDGDrainPumpData.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGDrainPumpData.cpp (.../VDGDrainPumpData.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -18,6 +18,12 @@ VIEW_DEF(VDGDrainPump, DGDrainPumpData) +/*! + * \brief VDGDrainPump::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ void VDGDrainPump::onActionReceive(const DGDrainPumpData &vData) { rpm ( vData.mRPM ); Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,18 +17,23 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" // namespace namespace View { +/*! + * \brief The VDGDrainPump class + * View for Model data DGDrainPumpData representation. + */ class VDGDrainPump : public QObject { Q_OBJECT - PROPERTY( quint32 , rpm , 0); - PROPERTY( quint32 , dac , 0); + PROPERTY( quint32 , rpm , 0) + PROPERTY( quint32 , dac , 0) VIEW_DEC(VDGDrainPump, DGDrainPumpData) }; Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,9 +28,9 @@ { Q_OBJECT - PROPERTY( quint32, mainPrimaryDC , 0); - PROPERTY( quint32, smallPrimaryDC , 0); - PROPERTY( quint32, trimmerDC , 0); + PROPERTY( quint32, mainPrimaryDC , 0) + PROPERTY( quint32, smallPrimaryDC , 0) + PROPERTY( quint32, trimmerDC , 0) VIEW_DEC(VDGHeaters, DGHeatersData) }; Index: sources/view/dg/data/VDGLoadCellReadingsData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,10 +28,14 @@ { Q_OBJECT - PROPERTY( float , reservoir1Prim , 0); - PROPERTY( float , reservoir1Bkup , 0); - PROPERTY( float , reservoir2Prim , 0); - PROPERTY( float , reservoir2Bkup , 0); + /*! - Reservoir 1 Primary */ + PROPERTY( float , reservoir1Prim , 0) + /*! - Reservoir 1 BackUp */ + PROPERTY( float , reservoir1Bkup , 0) + /*! - Reservoir 2 Primary */ + PROPERTY( float , reservoir2Prim , 0) + /*! - Reservoir 2 BackUp */ + PROPERTY( float , reservoir2Bkup , 0) VIEW_DEC(VDGLoadCellReadings, DGLoadCellReadingsData) }; Index: sources/view/dg/data/VDGOperationModeData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" #include "GuiGlobals.h" @@ -29,12 +30,12 @@ { Q_OBJECT - PROPERTY( quint32 , opMode , 0); + PROPERTY( quint32 , opMode , 0) - VIEW_DEC(VDGOperationMode, DGOperationModeData) - Q_PROPERTY(QString text READ text NOTIFY opModeChanged) + VIEW_DEC(VDGOperationMode, DGOperationModeData) + private: QString opModeText(GuiDGOpModes vEnum); Index: sources/view/dg/data/VDGPressuresData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,10 +28,10 @@ { Q_OBJECT - PROPERTY( float , roInletPSI , 0); - PROPERTY( float , roOutletPSI , 0); - PROPERTY( float , drainInletPSI , 0); - PROPERTY( float , drainOutletPSI , 0); + PROPERTY( float , roInletPSI , 0) + PROPERTY( float , roOutletPSI , 0) + PROPERTY( float , drainInletPSI , 0) + PROPERTY( float , drainOutletPSI , 0) VIEW_DEC(VDGPressures, DGPressuresData) }; Index: sources/view/dg/data/VDGROPumpData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,9 +28,9 @@ { Q_OBJECT - PROPERTY( quint32 , pressure , 0); - PROPERTY( float , flowRate , 0); - PROPERTY( float , pwm , 0); + PROPERTY( quint32 , pressure , 0) + PROPERTY( float , flowRate , 0) + PROPERTY( float , pwm , 0) VIEW_DEC(VDGROPump, DGROPumpData) }; Index: sources/view/dg/data/VDGReservoirData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,9 +28,9 @@ { Q_OBJECT - PROPERTY( float , activeReservoir , 0); - PROPERTY( float , fillToVol , 0); - PROPERTY( float , drainToVol , 0); + PROPERTY( float , activeReservoir , 0) + PROPERTY( float , fillToVol , 0) + PROPERTY( float , drainToVol , 0) VIEW_DEC(VDGReservoir, DGReservoirData) }; Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -27,18 +28,18 @@ { Q_OBJECT - PROPERTY( float , inletPrimaryHeater , 0); - PROPERTY( float , outletPrimaryHeater , 0); - PROPERTY( float , conductivitySensor1 , 0); - PROPERTY( float , conductivitySensor2 , 0); - PROPERTY( float , outletRedundancy , 0); - PROPERTY( float , inletDialysate , 0); - PROPERTY( float , primaryHeaterThermoCouple , 0); - PROPERTY( float , trimmerHeaterThermoCouple , 0); - PROPERTY( float , primaryHeaterColdJunction , 0); - PROPERTY( float , trimmerHeaterColdJunction , 0); - PROPERTY( float , primaryHeaterInternal , 0); - PROPERTY( float , trimmerHeaterInternal , 0); + PROPERTY( float , inletPrimaryHeater , 0) + PROPERTY( float , outletPrimaryHeater , 0) + PROPERTY( float , conductivitySensor1 , 0) + PROPERTY( float , conductivitySensor2 , 0) + PROPERTY( float , outletRedundancy , 0) + PROPERTY( float , inletDialysate , 0) + PROPERTY( float , primaryHeaterThermoCouple , 0) + PROPERTY( float , trimmerHeaterThermoCouple , 0) + PROPERTY( float , primaryHeaterColdJunction , 0) + PROPERTY( float , trimmerHeaterColdJunction , 0) + PROPERTY( float , primaryHeaterInternal , 0) + PROPERTY( float , trimmerHeaterInternal , 0) VIEW_DEC(VDGTemperatures, DGTemperaturesData) }; Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,26 +29,26 @@ Q_OBJECT // coco begin validated: Has been tested manually. This is a general messages received trigger, but is not used yet. - TRIGGER ( bool , refresh , false); + TRIGGER ( bool , refresh , false) // coco end - PROPERTY( bool , valveStates_01 , false); - PROPERTY( bool , valveStates_02 , false); - PROPERTY( bool , valveStates_03 , false); - PROPERTY( bool , valveStates_04 , false); - PROPERTY( bool , valveStates_05 , false); - PROPERTY( bool , valveStates_06 , false); - PROPERTY( bool , valveStates_07 , false); - PROPERTY( bool , valveStates_08 , false); - PROPERTY( bool , valveStates_09 , false); - PROPERTY( bool , valveStates_10 , false); - PROPERTY( bool , valveStates_11 , false); - PROPERTY( bool , valveStates_12 , false); + PROPERTY( bool , valveStates_01 , false) + PROPERTY( bool , valveStates_02 , false) + PROPERTY( bool , valveStates_03 , false) + PROPERTY( bool , valveStates_04 , false) + PROPERTY( bool , valveStates_05 , false) + PROPERTY( bool , valveStates_06 , false) + PROPERTY( bool , valveStates_07 , false) + PROPERTY( bool , valveStates_08 , false) + PROPERTY( bool , valveStates_09 , false) + PROPERTY( bool , valveStates_10 , false) + PROPERTY( bool , valveStates_11 , false) + PROPERTY( bool , valveStates_12 , false) - VIEW_DEC(VDGValvesStates, DGValvesStatesData) - Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) + VIEW_DEC(VDGValvesStates, DGValvesStatesData) + public slots: QString text(); }; Index: sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp (.../VTreatmentAdjustmentDuration.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp (.../VTreatmentAdjustmentDuration.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentadjustmentduration.cpp + * + * \file VTreatmentAdjustmentDuration.cpp * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 19-May-2020 - * + * */ #include "VTreatmentAdjustmentDuration.h" Index: sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentduration.h + * \file VTreatmentAdjustmentDuration.h * \author (last) Behrouz NemaiPour * \date (last) 12-Jun-2020 * \author (original) Behrouz NematiPour @@ -17,6 +17,9 @@ #include // Project +#include "main.h" // Doxygen : don't remove +#include "MModel.h" +#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -30,21 +33,23 @@ AdjustDurationRequestData _data; + // coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0); + TRIGGER( bool , adjustment , 0) // coco end // Treatment Duration data - PROPERTY( quint32 , duration , 0); - PROPERTY( float , ultrafiltration , 0); + PROPERTY( quint32 , duration , 0) + PROPERTY( float , ultrafiltration , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) -public slots: + // ----- Adjust Duration +public slots: void doAdjustment(quint32 vDuration) { _data.duration = vDuration; emit didAdjustment(_data); Index: sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp =================================================================== diff -u -rda39155b9644400a654a22bc010d5d7fa3526716 -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision da39155b9644400a654a22bc010d5d7fa3526716) +++ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentflows.cpp + * \file VTreatmentAdjustmentFlows.cpp * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NematiPour @@ -23,6 +23,12 @@ ADJUST_VIEW_CONNECTION( AdjustBloodDialysateRequestData); } +/*! + * \brief VTreatmentAdjustmentFlows::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ void VTreatmentAdjustmentFlows::onActionReceive(const AdjustBloodDialysateResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); Index: sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentflows.h + * \file VTreatmentAdjustmentFlows.h * \author (last) Behrouz NemaiPour * \date (last) 08-Jun-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,8 @@ #include // Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -30,21 +32,22 @@ AdjustBloodDialysateRequestData _data; + // coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0); + TRIGGER( bool , adjustment , 0) // coco end // Treatment Blood/Dialysate Flow data - PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0); - PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0); + PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) -public slots: // ----- Adjust Blood/Dialysate Flows +public slots: void doAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) { _data. bloodFlow = vBloodFlow; _data.dialysateFlow = vDialysateFlow; Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentadjustmentresponsebase.cpp + * + * \file VTreatmentAdjustmentResponseBase.cpp * \author (last) Behrouz NemaiPour * \date (last) 19-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 08-Jun-2020 - * + * */ #include "VTreatmentAdjustmentResponseBase.h" Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h (.../VTreatmentAdjustmentResponseBase.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h (.../VTreatmentAdjustmentResponseBase.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentresponsebase.h + * \file VTreatmentAdjustmentResponseBase.h * \author (last) Behrouz NemaiPour * \date (last) 08-Jun-2020 * \author (original) Behrouz NemaiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" #include "GuiGlobals.h" @@ -41,10 +42,10 @@ // The adjustment_Reason property as quint32 is not used directly in GUI // it will be used as QString text. // has been manually tested that it works perfectly fine if used. - PROPERTY( quint32 , adjustment_Reason , 0); + PROPERTY( quint32 , adjustment_Reason , 0) // coco end - PROPERTY( bool , adjustment_Accepted , 0); + PROPERTY( bool , adjustment_Accepted , 0) Q_PROPERTY(QString adjustment_ReasonText READ text NOTIFY adjustment_ReasonChanged) Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -34,15 +35,15 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0 ); + TRIGGER( bool , adjustment , 0 ) // coco end - PROPERTY( qint32 , target , 0 ); - PROPERTY( bool , isStarted , false ); - PROPERTY( bool , isDisabled , false ); // the Saline is disabled due to maximum cumulative volume reached. + PROPERTY( qint32 , target , 0 ) + PROPERTY( bool , isStarted , false ) + PROPERTY( bool , isDisabled , false ) // the Saline is disabled due to maximum cumulative volume reached. - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentSaline, AdjustSalineResponseData); - VIEW_DEC_SLOT(TreatmentStatesData); + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentSaline, AdjustSalineResponseData) + VIEW_DEC_SLOT(TreatmentStatesData) // ---------- Start/Stop Saline Bolus public slots: Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentadjustmentultrafiltrationconfirm.cpp + * + * \file VTreatmentAdjustmentUltrafiltrationConfirm.cpp * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 09-Jun-2020 - * + * */ #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentultrafiltrationconfirm.h + * \file VTreatmentAdjustmentUltrafiltrationConfirm.h * \author (last) Behrouz NemaiPour * \date (last) 22-Jun-2020 * \author (original) Behrouz NemaiPour @@ -17,6 +17,8 @@ #include // Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -34,24 +36,27 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0); + TRIGGER( bool , adjustment , 0) // coco end // Treatment Ultrafiltration data - PROPERTY( float , volume , 0); + PROPERTY( float , volume , 0) // coco begin validated: Manually validated // Duration is not used since will be passed each second by TreatmentTime message - PROPERTY( quint32 , duration , 0); + PROPERTY( quint32 , duration , 0) // Rate has not been decided to be used anywhere yet. - PROPERTY( float , rate , 0); + PROPERTY( float , rate , 0) // coco end + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) + // ----------- Adjust Ultrafiltration public slots: void doOptionRate (float vVolume); void doOptionDuration(float vVolume); signals: void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); }; + } Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentadjustmentultrafiltrationedit.cpp + * + * \file VTreatmentAdjustmentUltrafiltrationEdit.cpp * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NemaiPour * \date (original) 09-Jun-2020 - * + * */ #include "VTreatmentAdjustmentUltrafiltrationEdit.h" Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentultrafiltrationedit.h + * \file VTreatmentAdjustmentUltrafiltrationEdit.h * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NemaiPour @@ -17,6 +17,8 @@ #include // Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -34,22 +36,23 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0); + TRIGGER( bool , adjustment , 0) // coco end // Treatment Ultrafiltration data - PROPERTY( float , volume , 0); - PROPERTY( quint32 , duration , 0); - PROPERTY( qint32 , durationDiff , 0); - PROPERTY( float , rate , 0); - PROPERTY( float , rateDiff , 0); - PROPERTY( float , rateOld , 0); + PROPERTY( float , volume , 0) + PROPERTY( quint32 , duration , 0) + PROPERTY( qint32 , durationDiff , 0) + PROPERTY( float , rate , 0) + PROPERTY( float , rateDiff , 0) + PROPERTY( float , rateOld , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit, AdjustUltrafiltrationEditResponseData) -// ----------- Adjust Ultrafiltration + // ----------- Adjust Ultrafiltration public slots: void doAdjustment(float vVolume); + signals: void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); }; Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentultrafiltrationstate.cpp + * \file VTreatmentAdjustmentUltrafiltrationState.cpp * \author (last) Behrouz NemaiPour * \date (last) 23-Jun-2020 * \author (original) Behrouz NemaiPour Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentadjustmentultrafiltrationstate.h + * \file VTreatmentAdjustmentUltrafiltrationState.h * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NemaiPour @@ -17,6 +17,8 @@ #include // Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { @@ -34,14 +36,14 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0); + TRIGGER( bool , adjustment , 0) // coco end - PROPERTY( bool , isPaused , false); + PROPERTY( bool , isPaused , false) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) -// ---------- Pause Ultrafiltration + // ---------- Pause Ultrafiltration public slots: void doPause (); void doResume(); Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 valarmstatus.cpp + * \file VAlarmStatus.cpp * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 valarmstatus.h + * \file VAlarmStatus.h * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" #include "GuiGlobals.h" @@ -38,20 +39,20 @@ private: // coco begin validated: Has been validated manually - PROPERTY( quint32 , alarm_Priority , 0); - PROPERTY( quint32 , alarm_AlarmID , 0); - PROPERTY( quint32 , alarm_EscalateIn , 0); - PROPERTY( quint32 , alarm_MuteTimeout , 0); - PROPERTY( bool , alarm_Flag_systemFault , false); - PROPERTY( bool , alarm_Flag_stop , false); - PROPERTY( bool , alarm_Flag_noClear , false); - PROPERTY( bool , alarm_Flag_noResume , false); - PROPERTY( bool , alarm_Flag_noRinseback , false); - PROPERTY( bool , alarm_Flag_noEndTreatment , false); - PROPERTY( bool , alarm_Flag_noNewTreatment , false); - PROPERTY( bool , alarm_Flag_bypassDialyzer , false); - PROPERTY( bool , alarm_Flag_alarmsToEscalate , false); - PROPERTY( bool , alarm_Flag_alarmsSilenced , false); + PROPERTY( quint32 , alarm_Priority , 0) + PROPERTY( quint32 , alarm_AlarmID , 0) + PROPERTY( quint32 , alarm_EscalateIn , 0) + PROPERTY( quint32 , alarm_MuteTimeout , 0) + PROPERTY( bool , alarm_Flag_systemFault , false) + PROPERTY( bool , alarm_Flag_stop , false) + PROPERTY( bool , alarm_Flag_noClear , false) + PROPERTY( bool , alarm_Flag_noResume , false) + PROPERTY( bool , alarm_Flag_noRinseback , false) + PROPERTY( bool , alarm_Flag_noEndTreatment , false) + PROPERTY( bool , alarm_Flag_noNewTreatment , false) + PROPERTY( bool , alarm_Flag_bypassDialyzer , false) + PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) + PROPERTY( bool , alarm_Flag_alarmsSilenced , false) // coco end Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -23,6 +23,12 @@ opMode ( vData.mOpMode ); } +/*! + * \brief VHDOperationMode::opModeText + * \details returns the string conversion name of the enum GuiHDOpModes vEnum + * \param vEnum - the GuiHDOpModes vEnum + * \return String name of the enum + */ QString VHDOperationMode::opModeText(GuiHDOpModes vEnum) { // TEST : this code is the place holder for the alarms description mapping Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" #include "GuiGlobals.h" @@ -29,12 +30,12 @@ { Q_OBJECT - PROPERTY( quint32 , opMode , 0); + PROPERTY( quint32 , opMode , 0) - VIEW_DEC(VHDOperationMode, HDOperationModeData) - Q_PROPERTY(QString text READ text NOTIFY opModeChanged) + VIEW_DEC(VHDOperationMode, HDOperationModeData) + private: QString opModeText(GuiHDOpModes vEnum); Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VHDTreatmentStates.cpp + * \file VHDTreatmentStatesData.cpp * \date 8/11/2020 * \author Behrouz NematiPour * Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VHDTreatmentStates.h + * \file VHDTreatmentStatesData.h * \date 8/11/2020 * \author Behrouz NematiPour * @@ -17,6 +17,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" #include "GuiGlobals.h" @@ -29,11 +30,11 @@ { Q_OBJECT - PROPERTY( quint32, subMode , 0); - PROPERTY( quint32, ufState , 0); + PROPERTY( quint32, subMode , 0) + PROPERTY( quint32, ufState , 0) // coco begin validated: Validated manually, but has not been used yet. // instead VTreatmentAdjustmentSaline::isStarted is used which has more control over the saline state. - PROPERTY( quint32, salineState , 0); + PROPERTY( quint32, salineState , 0) // coco end VIEW_DEC(VHDTreatmentStates, TreatmentStatesData) Index: sources/view/hd/data/VTreatmentBloodFlow.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentbloodflow.cpp + * + * \file VTreatmentBloodFlow.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "VTreatmentBloodFlow.h" Index: sources/view/hd/data/VTreatmentBloodFlow.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentbloodflow.h + * \file VTreatmentBloodFlow.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,13 +29,13 @@ { Q_OBJECT - PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0); - PROPERTY( float , bloodFlow_MeasuredFlow , 0); - PROPERTY( float , bloodFlow_RotorSpeed , 0); - PROPERTY( float , bloodFlow_MotorSpeed , 0); - PROPERTY( float , bloodFlow_MotorCtlSpeed , 0); - PROPERTY( float , bloodFlow_MotorCtlCurrent, 0); - PROPERTY( float , bloodFlow_PWMDutyCycle , 0); + PROPERTY( qint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( float , bloodFlow_MeasuredFlow , 0) + PROPERTY( float , bloodFlow_RotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlSpeed , 0) + PROPERTY( float , bloodFlow_MotorCtlCurrent, 0) + PROPERTY( float , bloodFlow_PWMDutyCycle , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) }; Index: sources/view/hd/data/VTreatmentDialysateFlow.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentdialysateflow.cpp + * + * \file VTreatmentDialysateFlow.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "VTreatmentDialysateFlow.h" Index: sources/view/hd/data/VTreatmentDialysateFlow.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentdialysateflow.h + * \file VTreatmentDialysateFlow.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,13 +29,13 @@ { Q_OBJECT - PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0); - PROPERTY( float , dialysateFlow_MeasuredFlow , 0); - PROPERTY( float , dialysateFlow_RotorSpeed , 0); - PROPERTY( float , dialysateFlow_MotorSpeed , 0); - PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0); - PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0); - PROPERTY( float , dialysateFlow_PWMDutyCycle , 0); + PROPERTY( qint32 , dialysateFlow_FlowSetPoint , 0) + PROPERTY( float , dialysateFlow_MeasuredFlow , 0) + PROPERTY( float , dialysateFlow_RotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlSpeed , 0) + PROPERTY( float , dialysateFlow_MotorCtlCurrent, 0) + PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) }; Index: sources/view/hd/data/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentpressureocclusion.cpp + * + * \file VTreatmentPressureOcclusion.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Mar-2020 - * + * */ #include "VTreatmentPressureOcclusion.h" Index: sources/view/hd/data/VTreatmentPressureOcclusion.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentpressureocclusion.h + * \file VTreatmentPressureOcclusion.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,13 +29,13 @@ { Q_OBJECT - PROPERTY( float, pressureocclusion_ArterialPressure , 0); - PROPERTY( float, pressureocclusion_VenousPressure , 0); + PROPERTY( float, pressureocclusion_ArterialPressure , 0) + PROPERTY( float, pressureocclusion_VenousPressure , 0) // coco begin validated: These three properties have not been used in GUI. // has been manually tested that it works perfectly fine if used. - PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0); - PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0); - PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0); + PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0) + PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0) + PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0) // coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) }; Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentranges.cpp + * + * \file VTreatmentRanges.cpp * \author (last) Behrouz NemaiPour * \date (last) 04-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 31-Mar-2020 - * + * */ #include "VTreatmentRanges.h" Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentranges.h + * \file VTreatmentRanges.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,12 +29,12 @@ { Q_OBJECT - PROPERTY( quint32, treatmentRanges_Duration_Min , 0); - PROPERTY( quint32, treatmentRanges_Duration_Max , 0); - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0); - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0); - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0); - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max , 0); + PROPERTY( quint32, treatmentRanges_Duration_Min , 0) + PROPERTY( quint32, treatmentRanges_Duration_Max , 0) + PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0) + PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0) + PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0) + PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max , 0) VIEW_DEC(VTreatmentRanges, TreatmentRangesData) }; Index: sources/view/hd/data/VTreatmentSalineData.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentSalineData.cpp (.../VTreatmentSalineData.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentSalineData.cpp (.../VTreatmentSalineData.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vTreatmentSalineData.cpp + * \file VTreatmentSalineData.cpp * \author Behrouz NematiPour (last) * \date 10-Aug-2020 (last) * \author Behrouz NematiPour (original) Index: sources/view/hd/data/VTreatmentSalineData.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vTreatmentSalineData.h + * \file VTreatmentSalineData.h * \author Behrouz NematiPour (last) * \date 10-Aug-2020 (last) * \author Behrouz NematiPour (original) @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,9 +29,9 @@ { Q_OBJECT - PROPERTY( quint32 , target , 0); - PROPERTY( float , cumulative , 0); - PROPERTY( float , delivered , 0); + PROPERTY( quint32 , target , 0) + PROPERTY( float , cumulative , 0) + PROPERTY( float , delivered , 0) VIEW_DEC(VTreatmentSaline, TreatmentSalineData) }; Index: sources/view/hd/data/VTreatmentTime.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentTime.cpp (.../VTreatmentTime.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentTime.cpp (.../VTreatmentTime.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmenttime.cpp + * + * \file VTreatmentTime.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "VTreatmentTime.h" Index: sources/view/hd/data/VTreatmentTime.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentTime.h (.../VTreatmentTime.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentTime.h (.../VTreatmentTime.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmenttime.h + * \file VTreatmentTime.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -28,9 +29,9 @@ { Q_OBJECT - PROPERTY( quint32 , time_Total , 0); - PROPERTY( quint32 , time_Elapsed , 0); - PROPERTY( quint32 , time_Remaining , 0); + PROPERTY( quint32 , time_Total , 0) + PROPERTY( quint32 , time_Elapsed , 0) + PROPERTY( quint32 , time_Remaining , 0) VIEW_DEC(VTreatmentTime, TreatmentTimeData) }; Index: sources/view/hd/data/VTreatmentUltrafiltration.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 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 vtreatmentultrafiltration.cpp + * + * \file VTreatmentUltrafiltration.cpp * \author (last) Behrouz NemaiPour * \date (last) 04-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "VTreatmentUltrafiltration.h" Index: sources/view/hd/data/VTreatmentUltrafiltration.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rc503f43840024e18650c1ac558448dd0f3b70427 --- sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision c503f43840024e18650c1ac558448dd0f3b70427) @@ -5,7 +5,7 @@ * 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 vtreatmentultrafiltration.h + * \file VTreatmentUltrafiltration.h * \author (last) Behrouz NemaiPour * \date (last) 22-Jun-2020 * \author (original) Behrouz NematiPour @@ -18,6 +18,7 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "MModel.h" #include "VView.h" @@ -29,21 +30,21 @@ Q_OBJECT // coco begin validated : Manually validated - PROPERTY( float, precision , 3); // Centralized Gui value : none model property + PROPERTY( float, precision , 3) // Centralized Gui value : none model property // ~~~~~ Prescription values which we currently don't have. // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) - PROPERTY( float, minimum , 0.000); - PROPERTY( float, maximum , 0.600); + PROPERTY( float, minimum , 0.000) + PROPERTY( float, maximum , 0.600) // ~~~~~ // coco end - PROPERTY( float, ultrafiltration_RefUFVol , 0); - PROPERTY( float, ultrafiltration_MeasUFVol , 0); - PROPERTY( float, ultrafiltration_RotorSpeed , 0); - PROPERTY( float, ultrafiltration_MotorSpeed , 0); - PROPERTY( float, ultrafiltration_MotorCtlSpeed , 0); - PROPERTY( float, ultrafiltration_MotorCtlCurrent, 0); - PROPERTY( float, ultrafiltration_PWMDtCycle , 0); + PROPERTY( float, ultrafiltration_RefUFVol , 0) + PROPERTY( float, ultrafiltration_MeasUFVol , 0) + PROPERTY( float, ultrafiltration_RotorSpeed , 0) + PROPERTY( float, ultrafiltration_MotorSpeed , 0) + PROPERTY( float, ultrafiltration_MotorCtlSpeed , 0) + PROPERTY( float, ultrafiltration_MotorCtlCurrent, 0) + PROPERTY( float, ultrafiltration_PWMDtCycle , 0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData) };