Index: sources/view/vview.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/view/vview.h (.../vview.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/view/vview.h (.../vview.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -25,6 +25,7 @@ * * 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; @@ -69,34 +70,47 @@ VIEW_DEF_CLASS(vCLASS) \ VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) //--------------------------------------------------------------------------------// -//--------- Please add the view type to the lists below to register them ---------// + //--------------------------------------------------------------------------------// +// The Adjustment child definition in cpp +#define VIEW_DEC_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + VIEW_DEC_CLASS(vCLASS) \ + VIEW_DEC_SLOT (vDATATYPE) //--------------------------------------------------------------------------------// -#define REGISTER_VIEW_TYPES \ - REGISTER_TYPE( VTreatmentBloodFlow ) \ - REGISTER_TYPE( VTreatmentDialysateFlow ) \ - REGISTER_TYPE( VTreatmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentPressureOcclusion ) \ - REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VTreatmentAdjustmentsResponse ) \ - REGISTER_TYPE( VTreatmentRanges ) \ - REGISTER_TYPE( VAlarmStatus ) \ - REGISTER_TYPE( VPowerOff ) +#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + using namespace View; \ + vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ + initConnections(); \ + } + //--------------------------------------------------------------------------------// -#define VIEW_DEF_CONNECTION_ADJUSTMENTS \ - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustBloodDialysateResponseData); \ - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustDurationResponseData); + //--------------------------------------------------------------------------------// -#define VIEW_DEC_SLOT_ADJUSTMENTS \ - VIEW_DEC_SLOT(AdjustBloodDialysateResponseData) \ - VIEW_DEC_SLOT(AdjustDurationResponseData) +//--------- Please add the view type to the lists below to register them ---------// //--------------------------------------------------------------------------------// -#include "vtreatmentbloodflow.h" -#include "vtreatmentdialysateflow.h" -#include "vtreatmentultrafiltration.h" -#include "vtreatmentpressureocclusion.h" -#include "vtreatmenttime.h" -#include "vtreatmentadjustmentsresponse.h" -#include "vtreatmentranges.h" -#include "valarmstatus.h" -#include "vpoweroff.h" +//--------------------------------------------------------------------------------// +#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( VLoadCellReadings ) \ + REGISTER_TYPE( VTemperatureSensors ) \ + \ + REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ + REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) + + +//--------------------------------------------------------------------------------// +