Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) @@ -48,22 +48,6 @@ _bell.source = isSilenced ? "qrc:/images/bell-off.png" : "qrc:/images/bell.png" } - function setFlashing(enable) { - _timer.running = enable; - } - - // Placeholder animation - Timer { - id: _timer - interval: 1000; - running: false; - repeat: true; - onTriggered: { - _root.visible = !_root.visible; - - } - } - Image { id: _icon source: "qrc:/images/alarm.png" Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) @@ -41,20 +41,6 @@ signal clickedSilence(); signal clickedOkay(); - // Placeholder animation - Timer { - id: _timer - interval: 1000; - running: false; - onTriggered: { - _root.visible = !_root.visible; - } - } - - function setFlashing(enable) { - _timer.running = enable; - } - radius: 0; Rectangle { id: _titleBar; Index: sources/gui/qml/main.qml =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea --- sources/gui/qml/main.qml (.../main.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/gui/qml/main.qml (.../main.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) @@ -84,28 +84,7 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the Treatment______.qml - VAlarmStatus { id: vAlarmStatus - onRaiseAlarm: { - updateAlarm(); - _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced - _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, - vAlarmStatus.alarm_MuteTimeout); - - if (isAlarmHighPriority()) { - _alarm_dialog.visible = true; - _alarm_bar.visible = false; - } else { - if (!_alarm_dialog.visible) { - _alarm_bar.visible = true; - } - } - } - - onHideAlarm: { - _alarm_bar.visible = false; - _alarm_dialog.visible = false; - } - } + VAlarmStatus { id: vAlarmStatus } VPowerOff { id: vPowerOff } VHDOperationMode { id: vHDOperationMode } VTreatmentBloodFlow { id: vTreatmentBloodFlow } @@ -176,7 +155,6 @@ onClickedNotificationBar: { updateAlarm(); - _alarm_bar.setFlashing(false); _alarm_bar.visible = false; _alarm_dialog.visible = true; } @@ -199,21 +177,16 @@ NotificationDialog { id: _alarm_dialog alarmID: -1 - onClosed: { - _alarm_bar.visible = true; - } + onClickedOkay: { _alarm_dialog.visible = false; + _alarm_bar.visible = true; vAlarmStatus.requestOkay(alarmID) - if (isAlarmHighPriority()) { - _alarm_bar.setFlashing(true); - return; - } - _alarm_bar.setFlashing(false); } onClickedSilence: { _alarm_dialog.visible = false; + _alarm_bar.visible = true; vAlarmStatus.requestSilence(); } } @@ -304,4 +277,27 @@ } } } + + Connections { target: vAlarmStatus + onRaiseAlarm: { + updateAlarm(); + _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced + _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, + vAlarmStatus.alarm_MuteTimeout); + + if (isAlarmHighPriority()) { + _alarm_dialog.visible = true; + _alarm_bar.visible = false; + } else { + if (!_alarm_dialog.visible) { + _alarm_bar.visible = true; + } + } + } + + onNoAlarm: { + _alarm_bar.visible = false; + _alarm_dialog.visible = false; + } + } } Index: sources/view/valarmstatus.cpp =================================================================== diff -u -rbf645acccabb7b5a84801620c4f7fa0b0e6878e0 -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision bf645acccabb7b5a84801620c4f7fa0b0e6878e0) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) @@ -37,17 +37,11 @@ return; } - if (acknowledgedAlarms.contains(alarmID)) { - qDebug() << "Alarm ID " << alarmID << " has been acknowleged and is visible. "; - LOG_EVENT(tr("Alarm ID %0 has been acknowleged and is visible. ").arg(alarmID)); + if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { + emit noAlarm(); return; } - if (vData.mTop <= GuiAlarmID::ALARM_ID_NO_ALARM) { - emit hideAlarm(); - return; - } - alarm_Priority (vData.mState ); alarm_AlarmID (vData.mTop ); alarm_EscalateIn (vData.mMuteTimeout ); @@ -128,7 +122,8 @@ */ void VAlarmStatus::requestOkay(GuiAlarmID alarmID) { - acknowledgedAlarms.append(alarmID); + // This will need to go to the HD + qDebug() << __FUNCTION__ << "alarmID: " << alarmID; } /*! @@ -137,8 +132,7 @@ */ void VAlarmStatus::requestSilence() { - // TODO: Update with needed data. Placeholder for now. - QVariantList messageData = {1,2,3,4,5}; + QVariantList messageData = {1}; GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq; emit requestActionTransmit(messageAction, messageData); } Index: sources/view/valarmstatus.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) @@ -59,13 +59,12 @@ signals: void raiseAlarm(); - void hideAlarm(); + void noAlarm(); void requestActionTransmit(GuiActionType vAction, const QVariantList &vData); private: QString alarmPriorityText (GuiAlarmPriority vEnum); QString alarmIDText (GuiAlarmID vEnum); - QList acknowledgedAlarms; private slots: void onActionReceive(const AlarmStatusData &vData);