Index: sources/view/dg/data/VDGReservoirData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -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 VDGReservoirData.h - * \author (last) Behrouz NemaiPour - * \date (last) 02-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGReservoirData.h + * \author (last) Behrouz NematiPour + * \date (last) 31-Oct-2023 + * \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 "MDGReservoirData.h" // namespace namespace View { @@ -36,9 +36,18 @@ { Q_OBJECT - PROPERTY( float , activeReservoir , 0) - PROPERTY( float , fillToVol , 0) - PROPERTY( float , drainToVol , 0) + PROPERTY( quint32 , activeReservoir , 0) + PROPERTY( quint32 , fillToVol , 0) + PROPERTY( quint32 , drainToVol , 0) + PROPERTY( quint32 , timeReservoirCycleMS , 0) + PROPERTY( quint32 , timeReservoirFill2SwitchMS , 0) + PROPERTY( float , timeUFDecayMS , 0) + PROPERTY( float , tempUFFill , 0) + PROPERTY( float , tempReservoirUseActual , 0) + PROPERTY( float , tempReservoirEndFill , 0) + PROPERTY( float , tempAvgFill , 0) + PROPERTY( float , tempLastFill , 0) + PROPERTY( float , timereservoirFill , 0) VIEW_DEC(VDGReservoir, DGReservoirData) };