Index: sources/view/vview.h =================================================================== diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 --- sources/view/vview.h (.../vview.h) (revision 595ed1fbe8066960afd4c8fea168208e81b173d9) +++ sources/view/vview.h (.../vview.h) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) @@ -1,55 +1,129 @@ /*! - * + * * 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 vview.h - * date 3/9/2020 - * author Behrouz NematiPour - * + * \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 vview.h + * \author (last) Behrouz NematiPour + * \date (last) 13-Aug-2020 + * \author (original) Behrouz NematiPour + * \date (original) 10-Mar-2020 + * */ #pragma once +/*! + * \brief Denali Message UI usage instruction + * \details This comment explains how to use a Denali Message populated data in Denali UI Application + * + * 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 + * 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 + * + * 4 - Usage in UI : + * Import : import VTreatmentPressureOcclusion 0.1; + * Instantiate : VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } + * Access : value: vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure + * + */ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// // The child declaration in header -#define VIEW_DEC(vCLASS, vDATATYPE) \ +#define VIEW_DEC_CLASS(vCLASS) \ private: \ void initConnections(); \ public: \ - explicit vCLASS(QObject *parent = nullptr); \ + explicit vCLASS(QObject *parent = nullptr); +//--------------------------------------------------------------------------------// +#define VIEW_DEC_SLOT(vDATATYPE) \ private Q_SLOTS: \ - void onActionReceive (const vDATATYPE &vData); \ + void onActionReceive (const vDATATYPE &vData); +//--------------------------------------------------------------------------------// +#define VIEW_DEC(vCLASS, vDATATYPE) \ + VIEW_DEC_CLASS(vCLASS) \ + VIEW_DEC_SLOT(vDATATYPE) \ private: //--------------------------------------------------------------------------------// + +//--------------------------------------------------------------------------------// // The child definition in cpp -#define VIEW_DEF(vCLASS, vDATATYPE) \ -using namespace Gui; \ +#define VIEW_DEF_CLASS(vCLASS) \ +using namespace View; \ vCLASS::vCLASS(QObject *parent) : QObject(parent) { \ initConnections(); \ -} \ +} +//--------------------------------------------------------------------------------// +#define VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) \ void vCLASS::initConnections() { \ ACTION_RECEIVE_BRIDGE_CONNECTION( \ - _GuiController, vDATATYPE); \ + Gui::_GuiController, vDATATYPE); \ } //--------------------------------------------------------------------------------// +#define VIEW_DEF(vCLASS, vDATATYPE) \ + VIEW_DEF_CLASS(vCLASS) \ + 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_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + using namespace View; \ + vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ + initConnections(); \ + } + +//--------------------------------------------------------------------------------// + +//--------------------------------------------------------------------------------// //--------- Please add the view type to the lists below to register them ---------// //--------------------------------------------------------------------------------// -#include "vtreatmentbloodflow.h" -#include "vtreatmentdialysateflow.h" -#include "vtreatmentultrafiltration.h" -#include "vtreatmenttime.h" -#include "valarmstatus.h" -#include "vpoweroff.h" //--------------------------------------------------------------------------------// -#define REGISTER_VIEW_TYPES \ - REGISTER_TYPE( VTreatmentBloodFlow ) \ - REGISTER_TYPE( VTreatmentDialysateFlow ) \ - REGISTER_TYPE( VTreatmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VAlarmStatus ) \ - REGISTER_TYPE( VPowerOff ) +#define REGISTER_VIEW_TYPES \ + using namespace View; \ + \ + REGISTER_TYPE( VAlarmStatus ) \ + REGISTER_TYPE( VPowerOff ) \ + \ + REGISTER_TYPE( VTreatmentBloodFlow ) \ + REGISTER_TYPE( VTreatmentDialysateFlow ) \ + REGISTER_TYPE( VTreatmentUltrafiltration ) \ + REGISTER_TYPE( VTreatmentPressureOcclusion ) \ + REGISTER_TYPE( VTreatmentTime ) \ + REGISTER_TYPE( VTreatmentRanges ) \ + REGISTER_TYPE( VTreatmentSaline ) \ + REGISTER_TYPE( VHDOperationMode ) \ + REGISTER_TYPE( VHDTreatmentStates ) \ + \ + REGISTER_TYPE( VDGDrainPump ) \ + REGISTER_TYPE( VDGHeaters ) \ + REGISTER_TYPE( VDGLoadCellReadings ) \ + REGISTER_TYPE( VDGOperationMode ) \ + REGISTER_TYPE( VDGPressures ) \ + REGISTER_TYPE( VDGROPump ) \ + REGISTER_TYPE( VDGReservoir ) \ + REGISTER_TYPE( VDGTemperatures ) \ + REGISTER_TYPE( VDGValvesStates ) \ + \ + REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ + REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ + REGISTER_TYPE( VTreatmentCreate ) \ + REGISTER_TYPE( VPriming ) \ + REGISTER_TYPE( VTreatmentBegin ) \ + REGISTER_TYPE( VTreatmentAdjustmentSaline ) +//--------------------------------------------------------------------------------//