Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -147,7 +147,22 @@ emit didAlarmEmpty(); } else { - emit didAlarmRaise(); + if ( + // alarm id properties + _alarm_AlarmIDChanged + || _alarm_PriorityChanged + // alarm buttons + || _alarm_Flag_noResumeChanged + || _alarm_Flag_noRinsebackChanged + || _alarm_Flag_noEndTreatmentChanged + || _alarm_Flag_UserMustAckChanged + // alarm cannot be minimized + || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) + // alarm is out of silence + || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) + ){ + emit didAlarmRaise(); + } } } @@ -171,13 +186,3 @@ return alarmIDText(static_cast(alarm_AlarmID())); } -/*! - * \brief VAlarmStatus::id - * \return Gets the id of the alarm and returns the ID number as a QString - */ -QString VAlarmStatus::id() -{ - // coco begin validated: Has been validated manually - return QString("%0").arg(static_cast(alarm_AlarmID())); - // coco end -}