Index: sources/view/dg/data/VDGOperationModeData.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (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 VDGOperationModeData.cpp - * \author (last) Behrouz NemaiPour - * \date (last) 02-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGOperationModeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-May-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #include "VDGOperationModeData.h" @@ -21,25 +21,12 @@ void VDGOperationMode::onActionReceive(const DGOperationModeData &vData) { - opMode ( vData.mOpMode ); + opMode ( vData.mOpMode ); + subMode( vData.mSubMode ); } -QString VDGOperationMode::opModeText(GuiDGOpModes vEnum) -{ - // TEST : this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); - if (key) - return qPrintable(key); - else - return QString("UNDEFINED [%1]").arg(vEnum); -} - QString View::VDGOperationMode::text() { - QString text = opModeText(static_cast(opMode())); + QString text = Gui::enumString(static_cast(opMode())); return text; }