Index: sources/view/vview.h =================================================================== diff -u -r3676cd80ff97ac0785547e29e63f54b95b53f9f8 -rf148379112a69d1c52027f2667e95f3f96d948ad --- sources/view/vview.h (.../vview.h) (revision 3676cd80ff97ac0785547e29e63f54b95b53f9f8) +++ sources/view/vview.h (.../vview.h) (revision f148379112a69d1c52027f2667e95f3f96d948ad) @@ -35,42 +35,64 @@ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// // 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) \ +#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( \ Gui::_GuiController, vDATATYPE); \ } //--------------------------------------------------------------------------------// +#define VIEW_DEF(vCLASS, vDATATYPE) \ + VIEW_DEF_CLASS(vCLASS) \ + VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) +//--------------------------------------------------------------------------------// //--------- Please add the view type to the lists below to register them ---------// //--------------------------------------------------------------------------------// +//--------------------------------------------------------------------------------// +#define REGISTER_VIEW_TYPES \ + REGISTER_TYPE( VTreatmentBloodFlow ) \ + REGISTER_TYPE( VTreatmentDialysateFlow ) \ + REGISTER_TYPE( VTreatmentUltrafiltration ) \ + REGISTER_TYPE( VTreatmentPressureOcclusion ) \ + REGISTER_TYPE( VTreatmentTime ) \ + REGISTER_TYPE( VTreatmentAdjustmentsResponse ) \ + REGISTER_TYPE( VAlarmStatus ) \ + REGISTER_TYPE( VPowerOff ) +//--------------------------------------------------------------------------------// +#define VIEW_DEF_CONNECTION_ADJUSTMENTS \ + ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustBloodDialysateResponseData); +//--------------------------------------------------------------------------------// +#define VIEW_DEC_SLOT_ADJUSTMENTS \ + VIEW_DEC_SLOT(AdjustBloodDialysateResponseData) +//--------------------------------------------------------------------------------// #include "vtreatmentbloodflow.h" #include "vtreatmentdialysateflow.h" #include "vtreatmentultrafiltration.h" #include "vtreatmentpressureocclusion.h" #include "vtreatmenttime.h" +#include "vtreatmentadjustmentsresponse.h" #include "valarmstatus.h" #include "vpoweroff.h" -//--------------------------------------------------------------------------------// -#define REGISTER_VIEW_TYPES \ - REGISTER_TYPE( VTreatmentBloodFlow ) \ - REGISTER_TYPE( VTreatmentDialysateFlow ) \ - REGISTER_TYPE( VTreatmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentPressureOcclusion ) \ - REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VAlarmStatus ) \ - REGISTER_TYPE( VPowerOff ) -