Index: simulator/plugins/alarms/loader.py =================================================================== diff -u -r0c65b0562c34edf23a06bc224a00a7fbc340e9de -r313132b681260cc0761c65d46200adb40b72f478 --- simulator/plugins/alarms/loader.py (.../loader.py) (revision 0c65b0562c34edf23a06bc224a00a7fbc340e9de) +++ simulator/plugins/alarms/loader.py (.../loader.py) (revision 313132b681260cc0761c65d46200adb40b72f478) @@ -1,10 +1,6 @@ """ The Alarms ui loader class container file """ - -# shall be removed later -# from dialin.ui import denaliMessages - # Python import os from datetime import datetime @@ -79,6 +75,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 +194,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 +211,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 +221,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 +231,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) Index: simulator/run.py =================================================================== diff -u -r0c65b0562c34edf23a06bc224a00a7fbc340e9de -r313132b681260cc0761c65d46200adb40b72f478 --- simulator/run.py (.../run.py) (revision 0c65b0562c34edf23a06bc224a00a7fbc340e9de) +++ simulator/run.py (.../run.py) (revision 313132b681260cc0761c65d46200adb40b72f478) @@ -7,6 +7,7 @@ from PySide2 import QtCore, QtWidgets from simulator.loader import Simulator from dialin.ui.hd_simulator import HDSimulator +from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator, HIGH def main(): @@ -39,6 +40,10 @@ if HDSimulator.instanceCount > 1: raise Exception("more than one instance of HDSimulator shall not be created.") else: + if HDAlarmsSimulator.instanceCount > 1: + raise Exception("more than one instance of HDAlarmsSimulator shall not be created.") + else: + print("HDAlarmsSimulator number of instances is ", HDAlarmsSimulator.instanceCount) print("HDSimulator number of instances is ", HDSimulator.instanceCount)