Index: sources/view/VView.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -r88563177f10f20ced98750b2e40036201728131d --- sources/view/VView.h (.../VView.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/view/VView.h (.../VView.h) (revision 88563177f10f20ced98750b2e40036201728131d) @@ -99,70 +99,75 @@ //--------- Please add the view type to the lists below to register them ---------// //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// -#define REGISTER_VIEW_TYPES \ - using namespace View; \ - \ - REGISTER_TYPE( VSettings ) \ - \ - REGISTER_TYPE( VAlarmStatus ) \ - REGISTER_TYPE( VPowerOff ) \ - /* Data - States */ \ - REGISTER_TYPE( VHDOperationMode ) \ - REGISTER_TYPE( VPreTreatmentStates ) \ - REGISTER_TYPE( VHDTreatmentStates ) \ - /* In-Treatment - Data */ \ - REGISTER_TYPE( VTreatmentBloodFlow ) \ - REGISTER_TYPE( VTreatmentDialysateFlow ) \ - REGISTER_TYPE( VTreatmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentPressureOcclusion ) \ - REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VTreatmentRanges ) \ - REGISTER_TYPE( VTreatmentSaline ) \ - REGISTER_TYPE( VTreatmentHeparin ) \ - /* Post-Treatment */ \ - REGISTER_TYPE( VTreatmentRinseback ) \ - REGISTER_TYPE( VTreatmentRecirculate ) \ - REGISTER_TYPE( VTreatmentBloodPrime ) \ - /* Device - Data */ \ - REGISTER_TYPE( VHDAccelerometer ) \ - /* DG - Data */ \ - 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( VDGAccelerometer ) \ - /* Pre-Treatment */ \ - REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ - REGISTER_TYPE( VDGFilterFlush ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm ) \ - REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm ) \ - REGISTER_TYPE( VPreTreatmentSelfTestDry ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime ) \ - REGISTER_TYPE( VPreTreatmentDisposablesPrime ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin) \ - REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm ) \ - REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment ) \ - /* In-Treatment */ \ - REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ - REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ - REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ - REGISTER_TYPE( VTreatmentAdjustmentHeparin ) \ - REGISTER_TYPE( VTreatmentAdjustmentRinseback ) \ - REGISTER_TYPE( VTreatmentAdjustmentRecirculate ) \ - REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ - REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ - REGISTER_TYPE( VTreatmentCreate ) \ - REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ +#define REGISTER_VIEW_TYPES \ + using namespace View; \ + \ + REGISTER_TYPE( VSettings ) \ + \ + REGISTER_TYPE( VAlarmStatus ) \ + REGISTER_TYPE( VPowerOff ) \ + /* Data - States */ \ + REGISTER_TYPE( VHDOperationMode ) \ + REGISTER_TYPE( VPreTreatmentStates ) \ + REGISTER_TYPE( VHDTreatmentStates ) \ + REGISTER_TYPE( VPostTreatmentStates ) \ + /* In-Treatment - Data */ \ + REGISTER_TYPE( VTreatmentBloodFlow ) \ + REGISTER_TYPE( VTreatmentDialysateFlow ) \ + REGISTER_TYPE( VTreatmentUltrafiltration ) \ + REGISTER_TYPE( VTreatmentPressureOcclusion ) \ + REGISTER_TYPE( VTreatmentTime ) \ + REGISTER_TYPE( VTreatmentRanges ) \ + REGISTER_TYPE( VTreatmentSaline ) \ + REGISTER_TYPE( VTreatmentHeparin ) \ + /* End-Treatment */ \ + REGISTER_TYPE( VTreatmentRinseback ) \ + REGISTER_TYPE( VTreatmentRecirculate ) \ + REGISTER_TYPE( VTreatmentBloodPrime ) \ + /* Device - Data */ \ + REGISTER_TYPE( VHDAccelerometer ) \ + /* DG - Data */ \ + 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( VDGAccelerometer ) \ + /* Pre-Treatment */ \ + REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ + REGISTER_TYPE( VDGFilterFlush ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm ) \ + REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm ) \ + REGISTER_TYPE( VPreTreatmentSelfTestDry ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment ) \ + /* In-Treatment */ \ + REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ + REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ + REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ + REGISTER_TYPE( VTreatmentAdjustmentHeparin ) \ + REGISTER_TYPE( VTreatmentAdjustmentRinseback ) \ + REGISTER_TYPE( VTreatmentAdjustmentRecirculate ) \ + REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ + REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ + REGISTER_TYPE( VTreatmentCreate ) \ + REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ + /* Post-Treatment */ \ + REGISTER_TYPE( VPostTreatmentAdjustmentPatientDisconnectionConfirm ) \ + REGISTER_TYPE( VPostTreatmentAdjustmentDisposablesRemovalConfirm ) \ + REGISTER_TYPE( VPostTreatmentAdjustmentTreatmentLog ) \ //--------------------------------------------------------------------------------//