Index: sources/view/valarmstatus.cpp =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -39,14 +39,14 @@ } /*! - * \brief VAlarmStatus::alarmPriorityName + * \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::alarmPriorityName(GuiAlarmPriority vEnum) +QString VAlarmStatus::alarmPriorityText(GuiAlarmPriority vEnum) { // TEST : this code is the place holder for the alarms description mapping // since it is another feature @@ -57,14 +57,14 @@ } /*! - * \brief VAlarmStatus::alarmIDName + * \brief VAlarmStatus::alarmIDText * \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 ID * \return String representation of the Alarm Id Enum name */ -QString VAlarmStatus::alarmIDName(GuiAlarmID vEnum) +QString VAlarmStatus::alarmIDText(GuiAlarmID vEnum) { // TEST : this code is the place holder for the alarms description mapping // since it is another feature @@ -73,3 +73,23 @@ int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); return mo->enumerator(enumIdx).valueToKey(vEnum); } + +QString View::VAlarmStatus::text() +{ + QString text; + if (_alarm_AlarmID != GuiAlarmID::ALARM_ID_NO_ALARM) + text = alarmIDText (static_cast(_alarm_AlarmID)) + " , " + + _alarm_EscalateIn + " , " + + _alarm_MuteTimeout + " [" + + (_alarm_Flag_systemFault ? "1" : "0" ) + " " + + (_alarm_Flag_stop ? "1" : "0" ) + " " + + (_alarm_Flag_noClear ? "1" : "0" ) + " " + + (_alarm_Flag_noResume ? "1" : "0" ) + " " + + (_alarm_Flag_noRinseback ? "1" : "0" ) + " " + + (_alarm_Flag_noEndTreatment ? "1" : "0" ) + " " + + (_alarm_Flag_noNewTreatment ? "1" : "0" ) + " " + + (_alarm_Flag_bypassDialyzer ? "1" : "0" ) + " " + + (_alarm_Flag_alarmsToEscalate ? "1" : "0" ) + " " + + (_alarm_Flag_alarmsSilenced ? "1" : "0" ) + "]" ; + return text; +}