Index: sources/view/dg/data/disinfect/VDisinfectDGData.h =================================================================== diff -u -rc71946746586d5a4061ad866ce7dbbaf74b9798a -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) +++ sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -20,11 +20,9 @@ // Project #include "main.h" // Doxygen : don't remove #include "VView.h" -#include "MDisinfectDGFlushData.h" +#include "MDisinfectDGFlushTimeData.h" #include "MDisinfectDGHeatTimeData.h" -#include "MDisinfectDGHeatTemperatureData.h" #include "MDisinfectDGChemicalTimeData.h" -#include "MDisinfectDGChemicalTBDData.h" // namespace namespace View { @@ -40,33 +38,23 @@ { Q_OBJECT - // DisinfectDGFlushData - PROPERTY( quint32 , flushTimeTotal , 0) - PROPERTY( quint32 , flushTimeRemaining , 0) - PROPERTY( quint32 , flushTimeElapsed , 0) + // DisinfectDGFlushTimeData + PROPERTY( quint32 , flushTimeTotal , 0 ) + PROPERTY( quint32 , flushTimeRemaining , 0 ) + PROPERTY( quint32 , flushTimeElapsed , 0 ) // DisinfectDGHeatTimeData - PROPERTY( quint32 , heatTimeTotal , 0) - PROPERTY( quint32 , heatTimeRemaining , 0) - PROPERTY( quint32 , heatTimeElapsed , 0) - // DisinfectDGHeatTemperatureData - PROPERTY( float , heatTemperatureTarget , 0) - PROPERTY( float , heatTemperatureValue , 0) + PROPERTY( quint32 , heatTimeTotal , 0 ) + PROPERTY( quint32 , heatTimeRemaining , 0 ) + PROPERTY( quint32 , heatTimeElapsed , 0 ) // DisinfectDGChemicalTimeData - PROPERTY( quint32 , chemicalTimeTotal , 0) - PROPERTY( quint32 , chemicalTimeRemaining , 0) - PROPERTY( quint32 , chemicalTimeElapsed , 0) - // DisinfectDGChemicalTBDData - PROPERTY( float , chemicalTBDTarget , 0) - PROPERTY( float , chemicalTBDValue , 0) + PROPERTY( quint32 , chemicalTimeTotal , 0 ) + PROPERTY( quint32 , chemicalTimeRemaining , 0 ) + PROPERTY( quint32 , chemicalTimeElapsed , 0 ) - - - VIEW_DEC_CLASS(VDisinfectDGData ) - VIEW_DEC_SLOT (DisinfectDGFlushData ) + VIEW_DEC_SLOT (DisinfectDGFlushTimeData ) VIEW_DEC_SLOT (DisinfectDGHeatTimeData ) - VIEW_DEC_SLOT (DisinfectDGHeatTemperatureData ) VIEW_DEC_SLOT (DisinfectDGChemicalTimeData ) - VIEW_DEC_SLOT (DisinfectDGChemicalTBDData ) }; + }