Index: simulator/plugins/alarms/loader.py =================================================================== diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -ra3c7851a7de7cbed6b06abef5033b35308c04c93 --- simulator/plugins/alarms/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) +++ simulator/plugins/alarms/loader.py (.../loader.py) (revision a3c7851a7de7cbed6b06abef5033b35308c04c93) @@ -1,10 +1,21 @@ """ +########################################################################### +# +# Copyright (c) 2020-2026 Diality Inc. - All Rights Reserved. +# +# 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 loader.py +# +# @author (last) Behrouz NematiPour +# @date (last) 24-Feb-2021 +# @author (original) Behrouz NematiPour +# @date (original) 03-Dec-2020 +# +############################################################################ The Alarms ui loader class container file """ - -# shall be removed later -from dialin.squish import denaliMessages - # Python import os from datetime import datetime @@ -79,6 +90,7 @@ def __init__(self, hd_simulator: HDSimulator): super().__init__(os.path.dirname(__file__), hd_simulator) + self.alarm = hd_simulator.alarm() print(" ---------- ", self.hd_simulator) def _init_loader(self): @@ -197,11 +209,13 @@ mute_out = self.spnMuteTimeout.value() if alarm_id >= 0: self.set_flags() - denaliMessages.setAlarmStatus(self.priority, - alarm_id, - escalate, - mute_out, - self.flags) + self.alarm.cmd_activate_alarm_id( + self.priority, + alarm_id, + escalate, + mute_out, + self.flags + ) self.__append_status_ids_row(alarm_id) @Slot() @@ -212,7 +226,7 @@ """ alarm_id = self.spnAlarmID.value() if alarm_id: - denaliMessages.setAlarmTriggered(alarm_id) + self.alarm.cmd_set_alarm_triggered(alarm_id) self.__append_triggered_row(alarm_id) @Slot() @@ -222,7 +236,7 @@ :return: none """ [alarm_id, row] = self.alarm_id() - denaliMessages.setAlarmCleared(alarm_id) + self.alarm.cmd_set_alarm_cleared(alarm_id) self.tblTriggeredIDs.removeRow(row) @Slot() @@ -232,7 +246,7 @@ :return: none """ [alarm_id, row] = self.alarm_id() - denaliMessages.setAlarmClearedCondition(alarm_id) + self.alarm.cmd_set_alarm_cleared_condition(alarm_id) self.tblTriggeredIDs.item(row, self.eColID).setBackground(self.colors[AlarmPriority.ALARM_NONE]) self.tblTriggeredIDs.item(row, self.eColID).setSelected(False)