Index: sources/model/MAbstract.h =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/MAbstract.h (.../MAbstract.h) (revision a89b5249df072be403141463d7d88728b66a848e) +++ sources/model/MAbstract.h (.../MAbstract.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 MAbstract.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 02-Jul-2020 + * \file MAbstract.h + * \author (last) Behrouz NematiPour + * \date (last) 04-Aug-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ @@ -57,7 +57,7 @@ private: const char _delimiter = ','; - quint8 _precision = 2; + quint8 _precision = 3; public: enum class Type_Enum { @@ -69,21 +69,41 @@ eUI, eHD, eDG, + eDV, }; private: - const QMap _typeText { - {Type_Enum::eDatum, "D"}, - {Type_Enum::eEvent, "E"} - }; + typedef QMap TypeMap; + static const TypeMap _typeText; + static const TypeMap _typeText_make() { + static const TypeMap map { + {MAbstract::Type_Enum::eDatum, "D"}, + {MAbstract::Type_Enum::eEvent, "E"} + }; + return map; + } - const QMap _unitText { - {Unit_Enum::eUI, "UI"}, - {Unit_Enum::eHD, "HD"}, - {Unit_Enum::eDG, "DG"} - }; + typedef QMap UnitMap; + static const UnitMap _unitText; + static const UnitMap _unitText_make() { + static const UnitMap map { + {MAbstract::Unit_Enum::eUI, "UI"}, + {MAbstract::Unit_Enum::eHD, "HD"}, + {MAbstract::Unit_Enum::eDG, "DG"}, + {MAbstract::Unit_Enum::eDV, "DV"} + }; + return map; + } public: + static const QString unitText(const Unit_Enum &vEnum) { + return _unitText[vEnum]; + } + static const QString typeText(const Type_Enum &vEnum) { + return _typeText[vEnum]; + } + + // the model needs to implement these since each model have different meaning of the bytes from different source(unit). /*!