Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file NotificationBar.qml - * \author (last) Peter Lucia - * \date (last) 01-Jul-2020 + * \author (last) Behrouz NemaiPour + * \date (last) 06-Aug-2020 * \author (original) Behrouz NematiPour * \date (original) 30-Mar-2020 * Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file NotificationDialog.qml - * \author (last) Peter Lucia - * \date (last) 26-Jun-2020 + * \author (last) Behrouz NematiPour + * \date (last) 20-Aug-2020 * \author (original) Peter Lucia * \date (original) 02-Jun-2020 * @@ -66,6 +66,7 @@ anchors.centerIn: _titleBar; } } + Text { id: _desc objectName: "_NotificationDialog_Description" color: Colors.textMain @@ -94,6 +95,7 @@ } } + TouchRect { id : _dismiss width: _root.width / 3; text.text: qsTr("SILENCE") Index: sources/gui/qml/main.qml =================================================================== diff -u -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/gui/qml/main.qml (.../main.qml) (revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea) +++ sources/gui/qml/main.qml (.../main.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file main.qml - * \author (last) Peter Lucia - * \date (last) 26-Jun-2020 + * \author (last) Behrouz NematiPour + * \date (last) 25-Aug-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -78,7 +78,6 @@ ) break; } - } } @@ -158,8 +157,6 @@ _alarm_bar.visible = false; _alarm_dialog.visible = true; } - - } function isAlarmHighPriority() { @@ -207,6 +204,24 @@ font.pixelSize: 14 } + Rectangle { // TEST : SD-Card not present should be handled with better indication(s). + color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : "green" + anchors { + right : parent.right + bottom : parent.bottom + bottomMargin: 35 + rightMargin: 10 + } + width : 25 + height: 25 + radius: width + Image { id: _imageMicrosd + anchors.fill: parent + source: "qrc:/images/iMicroSD" + } + visible: true // ! _GuiView.sdIsReady || _GuiView.sdIsReadOnly + } + function getRootTextFromAlarmLevel(level) { let root_color = ""; let text_color = ""; @@ -226,10 +241,8 @@ default : // GuiActions.ALARM_PRIORITY_NONE root_color = Colors.textNotificationNoneBg; text_color = Colors.textNotificationNoneFg; - } return [root_color, text_color]; - } function getAlarmTopBarColors(level) { @@ -251,7 +264,6 @@ default : // GuiActions.ALARM_PRIORITY_NONE background = Colors.alarmTopBarLowBg; foreground = Colors.alarmTopBarLowFg; - } return [background, foreground]; } @@ -273,7 +285,6 @@ 2000 // notifies user and hides the dialog ) break; - } } } Index: sources/view/valarmstatus.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -37,16 +37,11 @@ return; } - if (acknowledgedAlarms.contains(alarmID)) { - LOG_EVENT(tr("Alarm ID %0 has been acknowledged 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 ); @@ -127,7 +122,8 @@ */ void VAlarmStatus::requestOkay(GuiAlarmID alarmID) { - acknowledgedAlarms.append(alarmID); + // This will need to go to the HD + qDebug() << __FUNCTION__ << "alarmID: " << alarmID; } /*! @@ -136,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 -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -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);