Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r38ae7b93679d05a54fc460dac68891562d7da72d --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VDGHeatersData.h - * \author (last) Behrouz NemaiPour - * \date (last) 02-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGHeatersData.h + * \author (last) Dara Navaei + * \date (last) 08-May-2024 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -18,9 +18,9 @@ #include // Project -#include "main.h" // Doxygen : don't remove -#include "MModel.h" +#include "main.h" // Doxygen : do not remove #include "VView.h" +#include "MDGHeatersData.h" // namespace namespace View { @@ -36,9 +36,19 @@ { Q_OBJECT - PROPERTY( quint32, mainPrimaryDC , 0) - PROPERTY( quint32, smallPrimaryDC , 0) - PROPERTY( quint32, trimmerDC , 0) + PROPERTY( float , mainPrimayHeaterDC , 0) + PROPERTY( float , smallPrimaryHeaterDC , 0) + PROPERTY( float , trimmerHeaterDC , 0) + PROPERTY( float , primaryTargetTemp , 0) + PROPERTY( float , trimmerTargetTemp , 0) + PROPERTY( quint32 , primaryHeaterState , 0) + PROPERTY( quint32 , trimmerHeaterState , 0) + PROPERTY( float , primaryEfficiency , 0) + PROPERTY( float , primaryCalcTargetTemp , 0) + PROPERTY( float , trimmerCalcCurrentTemp , 0) + PROPERTY( quint32 , trimmerUseLastDC , 0) + PROPERTY( float , trimmerPreviousFlow , 0) + PROPERTY( quint32 , trimmerControlCounter , 0) VIEW_DEC(VDGHeaters, DGHeatersData) };