Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.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 VDGValvesStatesData.h - * \author (last) Behrouz NemaiPour - * \date (last) 28-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGValvesStatesData.h + * \author (last) Behrouz NematiPour + * \date (last) 28-Mar-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 "MDGValvesStatesData.h" // namespace namespace View { @@ -36,28 +36,36 @@ { Q_OBJECT - // coco begin validated: Has been tested manually. This is a general messages received trigger, but is not used yet. TRIGGER ( bool , refresh , false) - // coco end - PROPERTY( bool , valveStates_01 , false) - PROPERTY( bool , valveStates_02 , false) - PROPERTY( bool , valveStates_03 , false) - PROPERTY( bool , valveStates_04 , false) - PROPERTY( bool , valveStates_05 , false) - PROPERTY( bool , valveStates_06 , false) - PROPERTY( bool , valveStates_07 , false) - PROPERTY( bool , valveStates_08 , false) - PROPERTY( bool , valveStates_09 , false) - PROPERTY( bool , valveStates_10 , false) - PROPERTY( bool , valveStates_11 , false) - PROPERTY( bool , valveStates_12 , false) + PROPERTY( quint8 , valveStates_VRF , 0 ) + PROPERTY( quint8 , valveStates_VRI , 0 ) + PROPERTY( quint8 , valveStates_RES , 0 ) + PROPERTY( quint8 , valveStates_VRO , 0 ) + PROPERTY( quint8 , valveStates_VPO , 0 ) + PROPERTY( quint8 , valveStates_VBF , 0 ) + PROPERTY( quint8 , valveStates_VRC , 0 ) + PROPERTY( quint8 , valveStates_VDR , 0 ) + PROPERTY( quint8 , valveStates_VPI , 0 ) + PROPERTY( quint8 , valveStates_VSP , 0 ) + PROPERTY( quint8 , valveStates_VR1 , 0 ) + PROPERTY( quint8 , valveStates_VR2 , 0 ) + PROPERTY( quint8 , valveStates_VPD , 0 ) - Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) + PROPERTY( quint8 , valveStatus_VRF , 0 ) + PROPERTY( quint8 , valveStatus_VRI , 0 ) + PROPERTY( quint8 , valveStatus_RES , 0 ) + PROPERTY( quint8 , valveStatus_VRO , 0 ) + PROPERTY( quint8 , valveStatus_VPO , 0 ) + PROPERTY( quint8 , valveStatus_VBF , 0 ) + PROPERTY( quint8 , valveStatus_VRC , 0 ) + PROPERTY( quint8 , valveStatus_VDR , 0 ) + PROPERTY( quint8 , valveStatus_VPI , 0 ) + PROPERTY( quint8 , valveStatus_VSP , 0 ) + PROPERTY( quint8 , valveStatus_VR1 , 0 ) + PROPERTY( quint8 , valveStatus_VR2 , 0 ) + PROPERTY( quint8 , valveStatus_VPD , 0 ) VIEW_DEC(VDGValvesStates, DGValvesStatesData) - -public slots: - QString text(); }; }