Index: sources/view/VView.h =================================================================== diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r59a1b4dceeb629ed08a434775d819ce108fe894b --- sources/view/VView.h (.../VView.h) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) +++ sources/view/VView.h (.../VView.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) @@ -121,7 +121,8 @@ #define REGISTER_VIEW_TYPES \ using namespace View; \ REGISTER_TYPE( VGeneralEvent ) \ - REGISTER_TYPE( VListModel ) \ + REGISTER_TYPE( VHeaderbarModel ) \ + REGISTER_TYPE( VWaterSampleModel ) \ /* CONFIRM */ \ REGISTER_TYPE( VConfirm ) \ /* POST */ \ @@ -150,6 +151,7 @@ REGISTER_TYPE( VAlarmActiveList ) \ /* Treatment Common */ \ REGISTER_TYPE( VTreatmentVitals ) \ + REGISTER_TYPE( VWaterSample ) \ /* Data - States */ \ REGISTER_TYPE( VTDOpMode ) \ REGISTER_TYPE( VPreTreatmentStates ) \ @@ -187,7 +189,7 @@ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDDHeaters ) \ REGISTER_TYPE( VDGLoadCellReadings ) \ - REGISTER_TYPE( VDGOperationMode ) \ + REGISTER_TYPE( VDDOperationMode ) \ REGISTER_TYPE( VDDPressures ) \ REGISTER_TYPE( VDGROPump ) \ REGISTER_TYPE( VDGReservoir ) \ @@ -208,6 +210,7 @@ REGISTER_TYPE( VFPConductivity ) \ REGISTER_TYPE( VFPTemperature ) \ REGISTER_TYPE( VFPBoostPump ) \ + REGISTER_TYPE( VFPRORejectionPercentage ) \ /* Pre-Treatment */ \ REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \ @@ -246,6 +249,7 @@ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \ + REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VTreatmentIsolatedUF ) \ REGISTER_TYPE( VTreatmentTrends ) \