Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r7fb8debadb3cbdc33036c3fd33072226cf4128b1 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7fb8debadb3cbdc33036c3fd33072226cf4128b1) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -1,31 +1,31 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VAlarmStatus.cpp - * \author (last) Behrouz NematiPour - * \date (last) 31-Aug-2020 - * \author (original) Behrouz NematiPour - * \date (original) 26-Aug-2020 + * \file VAlarmStatus.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 26-Aug-2020 * */ #include "VAlarmStatus.h" // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData) +VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus) void VAlarmStatus::initConnections() { ACTION_VIEW_CONNECTION(AlarmStatusData ); ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); - /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. + /* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_VIEW_CONNECTION(AlarmClearedConditionRequestData ); - coco end */ + // disabled coco end */ } /*! @@ -92,12 +92,12 @@ */ void View::VAlarmStatus::doClearCondition() { - // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. + // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. AlarmClearedConditionRequestData data; data.alarmID = GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT; emit didAdjustment(data); } -// coco end +// disabled coco end /*! * \brief VAlarmStatus::onActionReceive @@ -107,13 +107,13 @@ void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) { GuiAlarmID alarmID = static_cast(vData.mTop); - // coco begin validated: the gDisableTimeout has meant to only being used for debugging purposes. + // disabled coco begin validated: the gDisableTimeout has meant to only being used for debugging purposes. // has been manually tested during debugging which works fine as expected. if (alarmID == GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT && gDisableTimeout) { - LOG_EVENT(tr("Suppressing HD communication timeout.")); + LOG_DEBUG(tr("Suppressing HD communication timeout.")); return; } - // coco end + // disabled coco end // Look for this tag: #First_Time_Message_Sent_With_Silenced // this has to be first to make sure in the Notification dialog when we decided to show the dialog, @@ -133,48 +133,47 @@ alarm_Flag_noResume (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RESUME )); alarm_Flag_noRinseback (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK )); alarm_Flag_noEndTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT )); - alarm_Flag_noNewTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT )); - alarm_Flag_UserMustAck (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK )); + // alarm_Flag_noNewTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT )); // TODO : recently removed. 3/7/22 + alarm_Flag_UserMustAck (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY )); alarm_Flag_alarmsToEscalate (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE )); alarm_Flag_alarmsLampOn (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_LAMP_ON )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3 )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4 )); + if ( gDisableAlarmNoMinimize ) { + alarm_Flag_noMinimize (false); + } + else { + alarm_Flag_noMinimize (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE )); + } alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { + hasAlarm(false); emit didAlarmEmpty(); } else { - emit didAlarmRaise(); + hasAlarm(true); + 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(); + } } } /*! - * \brief VAlarmStatus::alarmPriorityText - * \details this code is the place holder for the alarms description mapping - * since it is another feature - * it returns the enum name for now - * \param vEnum - The Alarm priority - * \return String representation of the Alarm priority Enum name - */ -QString VAlarmStatus::alarmPriorityText(GuiAlarmPriority vEnum) -{ - // coco begin validated: this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); - if (key) - return qPrintable(key); - else - return QString("ALARM_PRIORITY_UNDEFINED [%1]").arg(vEnum); -} -// coco end - -/*! * \brief VAlarmStatus::alarmIDText * \details Looks up the alarm text from the alarm ID * \param vEnum - The Alarm ID @@ -194,13 +193,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 -}