Index: denali.pro.user =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- denali.pro.user (.../denali.pro.user) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ denali.pro.user (.../denali.pro.user) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/applicationcontroller.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -111,17 +111,8 @@ connect(&_Logger , SIGNAL(didExport()), this , SLOT( onExport())); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), - this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustDurationRequestData &)), - this , SLOT( onAdjustment(const AdjustDurationRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationEditRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationEditRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationConfirmRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationConfirmRequestData &))); - + // ---- + ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_GuiController ) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) } Index: sources/applicationcontroller.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -78,9 +78,6 @@ void onExportLog (); void onExport (); - - ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - signals: void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG @@ -91,17 +88,9 @@ void didExport (); + // ---- + ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS + ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS -private slots: void onAdjustment(const AdjustBloodDialysateRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustBloodDialysateRequestData &vData); -private slots: void onAdjustment(const AdjustDurationRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustDurationRequestData &vData); -private slots: void onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); -private slots: void onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); -private slots: void onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); - }; Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -102,19 +102,9 @@ connect(&_MessageAcknowModel , SIGNAL(didFailedTransmit( Sequence )), this , SLOT( onFailedTransmit( Sequence ))); - connect(&_ApplicationController, SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), - this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); - connect(&_ApplicationController, SIGNAL(didAdjustment(const AdjustDurationRequestData &)), - this , SLOT( onAdjustment(const AdjustDurationRequestData &))); - connect(&_ApplicationController, SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); - connect(&_ApplicationController, SIGNAL(didAdjustment(const AdjustUltrafiltrationEditRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationEditRequestData &))); - connect(&_ApplicationController, SIGNAL(didAdjustment(const AdjustUltrafiltrationConfirmRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationConfirmRequestData &))); - - // From HD -> Message interpreter - ACTION_RECEIVE_INTERPRETER_CONNECTIONS + // ---- + ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) + ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_interpreter ) } /*! Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -183,12 +183,6 @@ */ void didFrameTransmit (Can_Id vCan_Id, const QByteArray &vPayload); - void didAdjustment(const AdjustBloodDialysateRequestData &vData); - void didAdjustment(const AdjustDurationRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); - private slots: // A Frame has been received from CanInterface void onFrameReceive (Can_Id vCan_Id, const QByteArray &vPayload); @@ -200,14 +194,10 @@ // An Action has been requested to be transmitted. void onActionTransmit (GuiActionType vActionId, const QVariantList &vData); - - void onAdjustment(const AdjustBloodDialysateRequestData &vData); - void onAdjustment(const AdjustDurationRequestData &vData); - void onAdjustment(const AdjustUltrafiltrationStateRequestData &vData); - void onAdjustment(const AdjustUltrafiltrationEditRequestData &vData); - void onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); - + // ---- + ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS + }; } Index: sources/gui/guicontroller.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -81,6 +81,7 @@ connect(&_ApplicationController, SIGNAL(didExport()), this , SLOT( onExport())); + // ---- ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) } Index: sources/gui/guicontroller.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/gui/guicontroller.h (.../guicontroller.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -67,8 +67,6 @@ void onExport (); // OS => UI - ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - signals: void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG @@ -80,16 +78,9 @@ void didExportLog(); void didExport (); -public slots: void doAdjustment(const AdjustBloodDialysateRequestData &vData) { emit didAdjustment(vData); } -signals: void didAdjustment(const AdjustBloodDialysateRequestData &vData); -public slots: void doAdjustment(const AdjustDurationRequestData &vData) { emit didAdjustment(vData);} -signals: void didAdjustment(const AdjustDurationRequestData &vData); -public slots: void doAdjustment(const AdjustUltrafiltrationStateRequestData &vData) { emit didAdjustment(vData);} -signals: void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); -public slots: void doAdjustment(const AdjustUltrafiltrationEditRequestData &vData) { emit didAdjustment(vData);} -signals: void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); -public slots: void doAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) { emit didAdjustment(vData);} -signals: void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); + // ---- + ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC + ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS }; Index: sources/main.h =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/main.h (.../main.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/main.h (.../main.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -91,22 +91,47 @@ TRIGGER_SLOT( vTYPE , vVARIABLE) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// +#define ACTION_VIEW_CONNECTION(vTYPE) \ + connect(&_GuiController, SIGNAL(didActionReceive(const vTYPE &)), \ + this, SLOT( onActionReceive(const vTYPE &))); +//--------------------------------------------------------------------------------// +#define ADJUST_VIEW_CONNECTION(vTYPE) \ + connect( this, SIGNAL(didAdjustment (const vTYPE &)), \ + &_GuiController, SLOT( doAdjustment (const vTYPE &))); +//--------------------------------------------------------------------------------// +//--------------------------------------------------------------------------------// #define ACTION_METHOD_BRIDGE_CONNECTION(vMETHOD, vSOURCE, vTYPE) \ connect(&vSOURCE, SIGNAL(did##vMETHOD(const vTYPE &)), \ this , SLOT( on##vMETHOD(const vTYPE &))); //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, vTYPE) \ ACTION_METHOD_BRIDGE_CONNECTION(ActionReceive, vSOURCE, vTYPE) //--------------------------------------------------------------------------------// -#define ACTION_TRANSMT_BRIDGE_CONNECTION(vSOURCE, vTYPE) \ - ACTION_METHOD_BRIDGE_CONNECTION(ActionReceive, vSOURCE, vTYPE) +#define ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, vTYPE) \ + ACTION_METHOD_BRIDGE_CONNECTION(Adjustment , vSOURCE, vTYPE) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_PRIVATE_SLOT(vTYPE) \ private Q_SLOTS: \ void onActionReceive (const vTYPE &vData) { \ emit didActionReceive(vData); \ } //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION(vTYPE) \ +private Q_SLOTS: \ + void onAdjustment (const vTYPE &vData); +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_PRIVATE_SLOT(vTYPE) \ +private Q_SLOTS: \ + void onAdjustment (const vTYPE &vData) { \ + emit didAdjustment( vData); \ + } +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_PUBLIC_SLOT(vTYPE) \ +public Q_SLOTS: \ + void doAdjustment (const vTYPE &vData) { \ + emit didAdjustment( vData); \ + } +//--------------------------------------------------------------------------------// #define ACTION_RECEIVE_SIGNAL(vTYPE) \ Q_SIGNALS: \ void didActionReceive (const vTYPE &vData); @@ -115,10 +140,26 @@ Q_SIGNALS: \ void didActionTransmit(const vTYPE &vData); //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_SIGNAL(vTYPE) \ +Q_SIGNALS: \ + void didAdjustment (const vTYPE &vData); +//--------------------------------------------------------------------------------// #define ACTION_RECEIVE_BRIDGE_DEFINITION(vTYPE) \ ACTION_RECEIVE_PRIVATE_SLOT (vTYPE) \ ACTION_RECEIVE_SIGNAL (vTYPE) //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(vTYPE) \ + ADJUST_TRANSMT_PRIVATE_SLOT_DEFINITION (vTYPE) \ + ADJUST_TRANSMT_SIGNAL (vTYPE) +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_BRIDGE_DEFINITION(vTYPE) \ + ADJUST_TRANSMT_PRIVATE_SLOT (vTYPE) \ + ADJUST_TRANSMT_SIGNAL (vTYPE) +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(vTYPE) \ + ADJUST_TRANSMT_PUBLIC_SLOT (vTYPE) \ + ADJUST_TRANSMT_SIGNAL (vTYPE) +//--------------------------------------------------------------------------------// #define REGISTER_METATYPE(vTYPE) \ qRegisterMetaType < vTYPE > (#vTYPE); //--------------------------------------------------------------------------------// Index: sources/model/mmodel.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/model/mmodel.h (.../mmodel.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/model/mmodel.h (.../mmodel.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -128,18 +128,20 @@ REGISTER_METATYPE( AlarmStatusFlag ) \ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ - REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ + \ + REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ + REGISTER_METATYPE( AdjustDurationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ + \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ - REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) -//--------------------------------------------------------------------------------// +//===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ @@ -149,13 +151,20 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ + \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) - //--------------------------------------------------------------------------------// +#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 ) +//===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ @@ -165,27 +174,34 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ + \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) //--------------------------------------------------------------------------------// -#define ACTION_RECEIVE_INTERPRETER_CONNECTIONS \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, BloodFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, DialysateFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, OutletFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentTimeData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PressureOcclusionData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AlarmStatusData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PowerOffData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationStateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationEditResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationConfirmResponseData ) +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ + 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 ) //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_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 ) +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) +//===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ Index: sources/view/vtreatmentadjustmentduration.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/view/vtreatmentadjustmentduration.cpp (.../vtreatmentadjustmentduration.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentadjustmentduration.cpp (.../vtreatmentadjustmentduration.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -19,11 +19,8 @@ VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) void VTreatmentAdjustmentDuration::initConnections() { - - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustDurationResponseData); - - connect(this , SIGNAL(didAdjustment(AdjustDurationRequestData)), - &_GuiController, SLOT( doAdjustment(AdjustDurationRequestData))); + ACTION_VIEW_CONNECTION(AdjustDurationResponseData); + ADJUST_VIEW_CONNECTION( AdjustDurationRequestData); } void VTreatmentAdjustmentDuration::onActionReceive(const AdjustDurationResponseData &vData) Index: sources/view/vtreatmentadjustmentflows.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/view/vtreatmentadjustmentflows.cpp (.../vtreatmentadjustmentflows.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentadjustmentflows.cpp (.../vtreatmentadjustmentflows.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -18,11 +18,8 @@ VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) void VTreatmentAdjustmentFlows::initConnections() { - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustBloodDialysateResponseData); - //ACTION_TRANSMT_BRIDGE_CONNECTION - // ----- Adjust Blood/Dialysate Flows - connect(this , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), - &_GuiController, SLOT( doAdjustment(const AdjustBloodDialysateRequestData &))); + ACTION_VIEW_CONNECTION(AdjustBloodDialysateResponseData); + ADJUST_VIEW_CONNECTION( AdjustBloodDialysateRequestData); } void VTreatmentAdjustmentFlows::onActionReceive(const AdjustBloodDialysateResponseData &vData) Index: sources/view/vtreatmentadjustmentultrafiltration.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -19,11 +19,8 @@ VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltration, AdjustUltrafiltrationEditResponseData) void VTreatmentAdjustmentUltrafiltration::initConnections() { - - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationEditResponseData); - - connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationEditRequestData &)), - &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationEditRequestData &))); + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationEditResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationEditRequestData); } void VTreatmentAdjustmentUltrafiltration::onActionReceive(const AdjustUltrafiltrationEditResponseData &vData) Index: sources/view/vtreatmentultrafiltrationconfirm.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/view/vtreatmentultrafiltrationconfirm.cpp (.../vtreatmentultrafiltrationconfirm.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentultrafiltrationconfirm.cpp (.../vtreatmentultrafiltrationconfirm.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -19,11 +19,8 @@ VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) void VTreatmentUltrafiltrationConfirm::initConnections() { - - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController,AdjustUltrafiltrationConfirmResponseData); - - connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationConfirmRequestData &)), - &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationConfirmRequestData &))); + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationConfirmResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationConfirmRequestData); } void VTreatmentUltrafiltrationConfirm::onActionReceive(const AdjustUltrafiltrationConfirmResponseData &vData) Index: sources/view/vtreatmentultrafiltrationstate.cpp =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -19,11 +19,8 @@ VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) void VTreatmentUltrafiltrationState::initConnections() { - - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationStateResponseData); - - connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), - &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationStateRequestData &))); + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationStateRequestData); } void VTreatmentUltrafiltrationState::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData)