Index: denali.pro.user =================================================================== diff -u -r12cfad32f345ac72d777f9b97d25bdd4d0848527 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- denali.pro.user (.../denali.pro.user) (revision 12cfad32f345ac72d777f9b97d25bdd4d0848527) +++ denali.pro.user (.../denali.pro.user) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1176,7 +1176,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - + -q 3768 false true Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r846a9ebc350e33be4affab3cc4c136248900015d -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 846a9ebc350e33be4affab3cc4c136248900015d) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -296,6 +296,32 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Alarm Request Silence message. + * \param vData - Data model contains the silence request information. + * \return void + */ +void MessageDispatcher::onAdjustment(const AlarmSilenceRequestData &vData) +{ + QVariantList mData; + mData += vData.state; + onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Alarm Acknowledge Request message. + * \param vData - Data model contains the user acknowledge request information. + * \return void + */ +void MessageDispatcher::onAdjustment(const AlarmAcknowledgeRequestData &vData) +{ + QVariantList mData; + mData += vData.alarmID; + onActionTransmit(GuiActionType::ID_AlarmUserAckReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Confirm Treatment request message. * \param vData - Data model contains the confirm treatment request * \return void Index: sources/canbus/messageglobals.h =================================================================== diff -u -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -74,7 +74,8 @@ {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes {Gui::GuiActionType::ID_AlarmTriggered , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmUserAckReq , 1 * 4 }, // 1 parameter each 4bytes // ---- {Gui::GuiActionType::ID_StartTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -262,6 +262,12 @@ LOG_EVENT(AlarmSilenceRequestData::toString(vData)); } break; + case Gui::GuiActionType::ID_AlarmUserAckReq: { + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AlarmAcknowledgeRequestData::toString(vData)); + } break; + case Gui::GuiActionType::ID_StartTreatmentReq: { if ( ! count ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); Index: sources/gui/guiglobals.h =================================================================== diff -u -r846a9ebc350e33be4affab3cc4c136248900015d -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 846a9ebc350e33be4affab3cc4c136248900015d) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -81,6 +81,8 @@ ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, ID_AlarmCleared = 0x0400, + ID_AlarmUserAckReq = 0x3F00, // 63 + ID_AlarmSilenceReq = 0x3200, // 50 ID_CreateTreatmentReq = 0x3500, // 53 ID_CreateTreatmentRsp = 0x3600, // 54 @@ -91,7 +93,6 @@ ID_EndTreatmentRsp = 0x3C00, // 60 ID_PrimingData = 0x3700, // 55 - ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side ID_HDOperationModeData = 0x2500, // 37 Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -22,19 +22,19 @@ import "qrc:/components" /*! - * \brief Contains the PowerOff Dialog Implementation + * \brief Contains the Alarm Dialog Implementation */ ModalDialog { id : _root contentItem.objectName: "_NotificationDialog" // SquishQt - property alias titleText : _title.text; - property alias description : _desc.text; + property alias titleText : _title.text; + property alias description : _desc.text; property alias titleBarForeground : _title.color - property alias titleBarBackground : _titleBar.color; - property alias okayBtn : _okay; - property alias dismissBtn : _dismiss; - property bool isSilenced : false; - property int alarmID : -1 + property alias titleBarBackground : _titleBar.color + property alias okayBtn : _okay; + property alias silenceBtn : _silence + property bool isSilenced : false + property int alarmID : -1 visible: description @@ -96,7 +96,7 @@ } } - TouchRect { id : _dismiss + TouchRect { id : _silence width: _root.width / 3; text.text: qsTr("SILENCE") borderColor: _root.textColor; Index: sources/gui/qml/main.qml =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/gui/qml/main.qml (.../main.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/gui/qml/main.qml (.../main.qml) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -154,22 +154,23 @@ onClickedNotificationBar: { updateAlarm(); + vAlarmStatus.onSetMinimize(false); _alarm_bar.visible = false; _alarm_dialog.visible = true; } } - function isAlarmHighPriority() { - return vAlarmStatus.alarm_Priority === GuiActions.ALARM_PRIORITY_HIGH; - } - function updateAlarm() { _alarm_dialog.titleText = "Alarm"; _alarm_dialog.description = vAlarmStatus.text; _alarm_dialog.alarmID = vAlarmStatus.alarm_AlarmID; [_alarm_dialog.backgroundColor, _alarm_dialog.textColor] = getRootTextFromAlarmLevel(vAlarmStatus.alarm_Priority); [_alarm_dialog.titleBarBackground, _alarm_dialog.titleBarForeground] = getAlarmTopBarColors(vAlarmStatus.alarm_Priority); _alarm_bar.backgroundColor = _alarm_dialog.titleBarBackground; + + _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced; + _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, vAlarmStatus.alarm_MuteTimeout); + _alarm_dialog.silenceBtn.visible = !vAlarmStatus.alarm_Flag_alarmsSilenced; } NotificationDialog { id: _alarm_dialog @@ -178,13 +179,13 @@ onClickedOkay: { _alarm_dialog.visible = false; _alarm_bar.visible = true; - vAlarmStatus.requestOkay(alarmID) + vAlarmStatus.onRequestOkay(alarmID) } onClickedSilence: { _alarm_dialog.visible = false; _alarm_bar.visible = true; - vAlarmStatus.requestSilence(); + vAlarmStatus.onRequestSilence(); } } @@ -292,17 +293,13 @@ Connections { target: vAlarmStatus onRaiseAlarm: { updateAlarm(); - _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced - _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, - vAlarmStatus.alarm_MuteTimeout); - if (isAlarmHighPriority()) { + if (vAlarmStatus.minimizeAlarm) { + _alarm_dialog.visible = false; + _alarm_bar.visible = true; + } else { _alarm_dialog.visible = true; _alarm_bar.visible = false; - } else { - if (!_alarm_dialog.visible) { - _alarm_bar.visible = true; - } } } Index: sources/model/MModel.h =================================================================== diff -u -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/model/MModel.h (.../MModel.h) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) +++ sources/model/MModel.h (.../MModel.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -157,6 +157,8 @@ REGISTER_METATYPE( StartTreatmentRequestData ) \ REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ REGISTER_METATYPE( EndTreatmentRequestData ) \ + REGISTER_METATYPE( AlarmAcknowledgeRequestData ) \ + REGISTER_METATYPE( AlarmSilenceRequestData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ @@ -224,7 +226,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, ConfirmTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, EndTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmAcknowledgeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ @@ -273,7 +277,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( ConfirmTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( EndTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmAcknowledgeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) // /* Request */ ----------------------- NoEmit --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ @@ -284,7 +290,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( ConfirmTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( EndTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmAcknowledgeRequestData ) // /* Request */ ----------------------- public --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ @@ -295,7 +303,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmAcknowledgeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r846a9ebc350e33be4affab3cc4c136248900015d -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 846a9ebc350e33be4affab3cc4c136248900015d) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -157,7 +157,7 @@ class MAlarmSilenceReq : public MModel { public: - bool state = 0; + quint8 state; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { @@ -169,6 +169,20 @@ } }; +class MAlarmAcknowledgeReq : public MModel { +public: + quint32 alarmID; + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({alarmID}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AlarmAcknowledgeRequest", vParameters); + } +}; + class MStartTreatmentReq : public MModel { public: enum Options { @@ -229,3 +243,5 @@ typedef Model:: MEndTreatmentReq EndTreatmentRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; +typedef Model:: MAlarmAcknowledgeReq AlarmAcknowledgeRequestData; + Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -43,6 +43,7 @@ eFlag_bypassDialyzer , eFlag_alarmsToEscalate , eFlag_alarmsSilenced , + eFlag_userAcknowledged , eFlag_Bits_Length = 16, }; QString stringPrefix = "Alarm Status"; Index: sources/view/valarmstatus.cpp =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -26,6 +26,12 @@ connect(this, SIGNAL(requestActionTransmit(GuiActionType,QVariantList)), &_GuiController, SLOT(doActionTransmit(GuiActionType,QVariantList))); + + connect(this, SIGNAL(requestAlarmAcknowledge(AlarmAcknowledgeRequestData)), + &_GuiController, SLOT(doAdjustment(AlarmAcknowledgeRequestData))); + + connect(this, SIGNAL(requestAlarmSilence(AlarmSilenceRequestData)), + &_GuiController, SLOT(doAdjustment(AlarmSilenceRequestData))); } void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) @@ -44,22 +50,21 @@ alarm_Priority (vData.mState ); alarm_AlarmID (vData.mTop ); - alarm_EscalateIn (vData.mMuteTimeout ); - alarm_MuteTimeout (vData.mEscalatesIn ); - alarm_Flag_systemFault (vData.mFlags.at(AlarmStatusFlag::eFlag_systemFault )); - alarm_Flag_stop (vData.mFlags.at(AlarmStatusFlag::eFlag_stop )); - alarm_Flag_noClear (vData.mFlags.at(AlarmStatusFlag::eFlag_noClear )); - alarm_Flag_noResume (vData.mFlags.at(AlarmStatusFlag::eFlag_noResume )); - alarm_Flag_noRinseback (vData.mFlags.at(AlarmStatusFlag::eFlag_noRinseback )); - alarm_Flag_noEndTreatment (vData.mFlags.at(AlarmStatusFlag::eFlag_noEndTreatment )); - alarm_Flag_noNewTreatment (vData.mFlags.at(AlarmStatusFlag::eFlag_noNewTreatment )); - alarm_Flag_bypassDialyzer (vData.mFlags.at(AlarmStatusFlag::eFlag_bypassDialyzer )); - alarm_Flag_alarmsToEscalate (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsToEscalate)); - alarm_Flag_alarmsSilenced (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsSilenced )); + alarm_EscalateIn (vData.mEscalatesIn ); + alarm_MuteTimeout (vData.mMuteTimeout ); + alarm_Flag_systemFault (vData.mFlags.at(AlarmStatusFlag::eFlag_systemFault )); + alarm_Flag_stop (vData.mFlags.at(AlarmStatusFlag::eFlag_stop )); + alarm_Flag_noClear (vData.mFlags.at(AlarmStatusFlag::eFlag_noClear )); + alarm_Flag_noResume (vData.mFlags.at(AlarmStatusFlag::eFlag_noResume )); + alarm_Flag_noRinseback (vData.mFlags.at(AlarmStatusFlag::eFlag_noRinseback )); + alarm_Flag_noEndTreatment (vData.mFlags.at(AlarmStatusFlag::eFlag_noEndTreatment )); + alarm_Flag_noNewTreatment (vData.mFlags.at(AlarmStatusFlag::eFlag_noNewTreatment )); + alarm_Flag_bypassDialyzer (vData.mFlags.at(AlarmStatusFlag::eFlag_bypassDialyzer )); + alarm_Flag_alarmsToEscalate (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsToEscalate )); + alarm_Flag_alarmsSilenced (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsSilenced )); + alarm_Flag_UserAcknowledged (vData.mFlags.at(AlarmStatusFlag::eFlag_userAcknowledged )); emit raiseAlarm(); - - } /*! @@ -118,21 +123,33 @@ /*! * \brief VAlarmStatus::requestOkay - * Send out a request to acknowledge alarms. + * Send out a request to acknowledge this alarmID */ -void VAlarmStatus::requestOkay(GuiAlarmID alarmID) +void VAlarmStatus::onRequestOkay(GuiAlarmID alarmID) { - // This will need to go to the HD - qDebug() << __FUNCTION__ << "alarmID: " << alarmID; + AlarmAcknowledgeRequestData data; + data.alarmID = (quint32)alarmID; + emit requestAlarmAcknowledge(data); + onSetMinimize(true); // TODO: Remove once FW implements user acknowledge } /*! - * \brief VAlarmStatus::requestSilence - * Send out a request to silence alarms. + * \brief VAlarmStatus::onToggleMinimize + * Toggles the whether the alarm should be minimized */ -void VAlarmStatus::requestSilence() +void VAlarmStatus::onSetMinimize(bool minimize) { - QVariantList messageData = {1}; - GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq; - emit requestActionTransmit(messageAction, messageData); + minimizeAlarm(minimize); } + +/*! + * \brief VAlarmStatus::requestSilence + * Send out a request to silence alarms + */ +void VAlarmStatus::onRequestSilence() +{ + AlarmSilenceRequestData data; + data.state = 1; + emit requestAlarmSilence(data); + onSetMinimize(true); +} Index: sources/view/valarmstatus.h =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -52,15 +52,22 @@ PROPERTY( bool , alarm_Flag_bypassDialyzer , false) PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) + PROPERTY( bool , alarm_Flag_UserAcknowledged , false) + PROPERTY( bool , minimizeAlarm , false) // coco end + Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) + + signals: void raiseAlarm(); void noAlarm(); void requestActionTransmit(GuiActionType vAction, const QVariantList &vData); + void requestAlarmAcknowledge(AlarmAcknowledgeRequestData); + void requestAlarmSilence(AlarmSilenceRequestData); private: QString alarmPriorityText (GuiAlarmPriority vEnum); @@ -73,8 +80,9 @@ public slots: QString text(); QString id(); - void requestOkay(GuiAlarmID alarmID); - void requestSilence(); + void onRequestOkay(GuiAlarmID alarmID); + void onRequestSilence(); + void onSetMinimize(bool minimize); };