Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r6f2622be80fcaee8d71baf78404627381157970c --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 6f2622be80fcaee8d71baf78404627381157970c) @@ -49,6 +49,26 @@ // friends friend class ::tst_views; + + typedef QMap InstructionData; + struct AlarmData { + QString title = ""; + QString message = ""; + InstructionData instructions; + bool hasInstruction() { return instructions.count(); } + }; + + bool isTitle (const QString &vKey) { + return vKey == "Title"; + } + + bool isMessage (const QString &vKey) { + return vKey == "Message"; + } + + QMap _alarms; + + // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // READONLY( bool , hasAlarm , false) // disabled coco begin validated: Has been validated manually PROPERTY( quint32 , alarm_Priority , 0) @@ -71,16 +91,28 @@ PROPERTY( bool , alarm_Flag_alarmsCondition , false) // disabled coco end - Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) + // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // + Q_PROPERTY(QString title READ title NOTIFY alarm_AlarmIDChanged ) + Q_PROPERTY(QString message READ message NOTIFY alarm_AlarmIDChanged ) + Q_PROPERTY(QStringList instructionKeys READ instructionKeys NOTIFY alarm_AlarmIDChanged ) + Q_PROPERTY(QStringList instructionValues READ instructionValues NOTIFY alarm_AlarmIDChanged ) + Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged ) - VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData ) - ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData) + VIEW_DEC_CLASS ( VAlarmStatus ) + VIEW_DEC_SLOT ( AlarmStatusData ) + VIEW_DEC_SLOT ( SettingsData ) + ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData ) + private: - QString text (); - QString alarmIDText (GuiAlarmID vEnum); + QString title (); + QString message (); + QStringList instructionKeys (); + QStringList instructionValues (); + QString text (); + QString alarmIDText (GuiAlarmID vEnum); signals: void didAlarmRaise();