Index: denali.pro.user =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- denali.pro.user (.../denali.pro.user) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ denali.pro.user (.../denali.pro.user) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1481,7 +1481,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - --disable-timeout --logOut + --disable-timeout 3768 false true Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -46,7 +46,7 @@ vAlarmStatus.doClearCondition() } - // Alarms + // Alarms dialog/bar navigation handling ----- vvvvv ----- function alarmMinimize() { _alarmDialog .visible = false _alarmListDialog.visible = false @@ -69,18 +69,32 @@ _alarmBar .visible = false } + Connections { target: _alarmDialog + onMinimizeClicked : vAlarmStatus.alarm_Flag_noMinimize ? alarmList() : alarmMinimize() + } + Connections { target: _alarmListDialog + onMinimizeClicked : vAlarmStatus.alarm_Flag_noMinimize ? alarmMaximize() : alarmMinimize() + } Connections { target: _alarmBar - onMuteClicked : vAlarmStatus.doSilence() onListClicked : alarmList() onMaximizeClicked : alarmMaximize() onClicked : alarmMaximize() } + Connections { target: vAlarmStatus + onDidAlarmRaise: alarmMaximize() + onDidAlarmEmpty: alarmHide() + } + // ----- ^^^^^ ----- + Connections { target: _alarmBar + onMuteClicked : vAlarmStatus.doSilence() + } + // TODO : Later need to create a base Notification dialog class // and inherit NotificationDialog and AlarmListDialog from that - // Beter be the NotificationDialog defined as parent - // and two separate dialogs by the names of AlarmDialog , AlarmListDlialog creatd. - // Same for the Notification Bar + // Better be the NotificationDialog defined as parent + // and create two separate dialogs by the names of AlarmDialog , AlarmListDlialog. + // Same for the NotificationBar NotificationDialog { id : _alarmDialog // this will change later to the actual message text // and the instruction would be in the dialog content @@ -101,68 +115,22 @@ onRinsebackClicked : vAlarmStatus.doUserActionRinseback() onEndClicked : vAlarmStatus.doUserActionEnd () onOkClicked : vAlarmStatus.doUserActionOk () - onMinimizeClicked : { - if ( vAlarmStatus.alarm_Flag_noMinimize ) { - alarmList() - } - else { - alarmMinimize() - // when user minimizes the alarm it can stay minimized until otherwize is set - // by the next alarm status received. - // see also the "Connections { target: vAlarmStatus" implementation - vAlarmStatus.alarm_KeepMinimized = true - } - } } AlarmListDialog { id : _alarmListDialog isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout minVisible : ! vAlarmStatus.alarm_Flag_noMinimize onMuteClicked : vAlarmStatus.doSilence() - onMinimizeClicked : { - if ( vAlarmStatus.alarm_Flag_noMinimize ) { - alarmMaximize() - } - else { - alarmMinimize() - } - } - titleFading : vHDOperationMode.fault } Connections { target: vAlarmStatus - onAlarm_Flag_noResumeChanged : vAlarmStatus.alarm_KeepMinimized = false - onAlarm_Flag_noRinsebackChanged : vAlarmStatus.alarm_KeepMinimized = false - onAlarm_Flag_noEndTreatmentChanged : vAlarmStatus.alarm_KeepMinimized = false - onAlarm_Flag_UserMustAckChanged : vAlarmStatus.alarm_KeepMinimized = false - onAlarm_AlarmIDChanged : vAlarmStatus.alarm_KeepMinimized = false - onAlarm_Flag_alarmsSilencedChanged : vAlarmStatus.alarm_KeepMinimized = vAlarmStatus.alarm_Flag_alarmsSilenced onAlarm_PriorityChanged: [ _alarmDialog.titleBarBackground, _alarmDialog.titleBarForeground, _alarmDialog.backgroundColor , _alarmDialog.textColor , ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) - - - onDidAlarmRaise: { - let silenceMinimize = false - if (vAlarmStatus.alarm_Flag_alarmsSilenced && silenceMinimize) { - // this is the response to the silence request - // so the dialog should be closed when the request accepted - // if not then if can stay minimized nothing happens - // if can't stay minimized then it has to be shown - alarmMinimize() - } - else { - if (! vAlarmStatus.alarm_KeepMinimized) { - alarmMaximize() - } - } - } - - onDidAlarmEmpty: alarmHide() } } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -27,8 +27,8 @@ 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 isSilenced : _muteButton.isSilenced Index: sources/main.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/main.h (.../main.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/main.h (.../main.h) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -75,7 +75,8 @@ */\ void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ static bool init = false; \ - if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ + _##vVARIABLE##Changed = _##vVARIABLE != v##vVARIABLE; \ + if ( !init || _##vVARIABLE##Changed ) { \ DEBUG_PROPERTY_CHANGED(vVARIABLE, v) \ init = true; \ _##vVARIABLE = v##vVARIABLE; \ @@ -94,6 +95,7 @@ */\ void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ DEBUG_PROPERTY_CHANGED(vVARIABLE, v) \ + _##vVARIABLE##Changed = true; \ _##vVARIABLE = v##vVARIABLE; \ emit vVARIABLE##Triggered( _##vVARIABLE ); \ } @@ -108,7 +110,8 @@ \param new value */\ void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ - if ( _##vVARIABLE != v##vVARIABLE ) { \ + _##vVARIABLE##Changed = _##vVARIABLE != v##vVARIABLE; \ + if ( _##vVARIABLE##Changed ) { \ DEBUG_PROPERTY_CHANGED(vVARIABLE, v) \ _##vVARIABLE = v##vVARIABLE; \ emit vVARIABLE##Entered( _##vVARIABLE ); \ @@ -133,7 +136,8 @@ */\ void vVARIABLE##vSIGNAL( const vTYPE & v##vVARIABLE ); \ private: \ - vTYPE _##vVARIABLE = vDEFVALUE; \ + vTYPE _##vVARIABLE = vDEFVALUE; \ + bool _##vVARIABLE##Changed = false; \ protected: \ /*! \brief Property getter \details The property getter which reads the private variable Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -147,7 +147,22 @@ emit didAlarmEmpty(); } else { - emit didAlarmRaise(); + if ( + // alarm id properties + _alarm_AlarmIDChanged + || _alarm_PriorityChanged + // alarm buttons + || _alarm_Flag_noResumeChanged + || _alarm_Flag_noRinsebackChanged + || _alarm_Flag_noEndTreatmentChanged + || _alarm_Flag_UserMustAckChanged + // alarm cannot be minimized + || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) + // alarm is out of silence + || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) + ){ + emit didAlarmRaise(); + } } } @@ -171,13 +186,3 @@ return alarmIDText(static_cast(alarm_AlarmID())); } -/*! - * \brief VAlarmStatus::id - * \return Gets the id of the alarm and returns the ID number as a QString - */ -QString VAlarmStatus::id() -{ - // coco begin validated: Has been validated manually - return QString("%0").arg(static_cast(alarm_AlarmID())); - // coco end -} Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) @@ -68,20 +68,16 @@ // 3 reserved flags are here... PROPERTY( bool , alarm_Flag_noMinimize , false) PROPERTY( bool , alarm_Flag_alarmsCondition , false) - - PROPERTY( bool , alarm_KeepMinimized , false) // coco end Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) - Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData ) ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData) private: - QString id (); QString text (); QString alarmIDText (GuiAlarmID vEnum);