Index: sources/view/valarmstatus.h =================================================================== diff -u -r255df1f61af0193b8f2f9630bdf3ce68be0f5e29 -rc66e8e38c6c26cf108c975a7b068e45fe5b56f89 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision 255df1f61af0193b8f2f9630bdf3ce68be0f5e29) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision c66e8e38c6c26cf108c975a7b068e45fe5b56f89) @@ -21,6 +21,8 @@ #include "vview.h" #include "guiglobals.h" #include "messageglobals.h" +#include "guicontroller.h" +#include "format.h" using namespace Can; // namespace @@ -30,7 +32,10 @@ class VAlarmStatus : public QObject { Q_OBJECT +public: + VAlarmStatus(QObject *parent = NULL); +private: PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) PROPERTY( quint32 , alarm_EscalateIn , 0) @@ -46,12 +51,9 @@ PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) - - Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) - VIEW_DEC(VAlarmStatus, AlarmStatusData) signals: void raiseAlarm(); void hideAlarm(); @@ -60,10 +62,16 @@ private: QString alarmPriorityText (GuiAlarmPriority vEnum); QString alarmIDText (GuiAlarmID vEnum); + QList acknowledgedAlarms; +private slots: + void onActionReceive(const AlarmStatusData &vData); + + public slots: QString text(); QString id(); + void requestOkay(GuiAlarmID alarmID); void requestSilence(); };