Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7777127f3b60d5f884cd07adc9d586353d914f69) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData) +VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus) void VAlarmStatus::initConnections() { ACTION_VIEW_CONNECTION(AlarmStatusData ); @@ -140,7 +140,7 @@ // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3 )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4 )); + alarm_Flag_noMinimize (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE )); alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { @@ -152,29 +152,6 @@ } /*! - * \brief VAlarmStatus::alarmPriorityText - * \details this code is the place holder for the alarms description mapping - * since it is another feature - * it returns the enum name for now - * \param vEnum - The Alarm priority - * \return String representation of the Alarm priority Enum name - */ -QString VAlarmStatus::alarmPriorityText(GuiAlarmPriority vEnum) -{ - // coco begin validated: 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("ALARM_PRIORITY_UNDEFINED [%1]").arg(vEnum); -} -// coco end - -/*! * \brief VAlarmStatus::alarmIDText * \details Looks up the alarm text from the alarm ID * \param vEnum - The Alarm ID