Index: simulator/plugins/alarms/loader.py =================================================================== diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/alarms/loader.py (.../loader.py) (revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c) +++ simulator/plugins/alarms/loader.py (.../loader.py) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -40,6 +40,11 @@ lstFlags: QtWidgets.QListWidget tblTriggeredIDs: QtWidgets.QTableWidget + cbFieldDescriptor1: QtWidgets.QComboBox + cbFieldDescriptor2: QtWidgets.QComboBox + leDataField1: QtWidgets.QLineEdit + leDataField2: QtWidgets.QLineEdit + priority = AlarmPriority.ALARM_HIGH flags = 0 @@ -100,6 +105,11 @@ self.spnAlarmID = self.find_spinbox('spnAlarmID') self.tblTriggeredIDs = self.find_table_widget('tblTriggeredIDs') + self.cbFieldDescriptor1 = self.find_combobox('cbFieldDescriptor1') + self.cbFieldDescriptor2 = self.find_combobox('cbFieldDescriptor2') + self.leDataField1 = self.find_line_edit('leDataField1') + self.leDataField2 = self.find_line_edit('leDataField2') + def _init_widgets(self): """ initializes the widgets' properties @@ -209,8 +219,19 @@ :return: none """ alarm_id = self.spnAlarmID.value() + field_descriptor_1 = self.cbFieldDescriptor1.currentIndex() + data_field_1 = self.leDataField1.text() + if data_field_1 == "": + data_field_1 = "0" + field_descriptor_2 = self.cbFieldDescriptor2.currentIndex() + data_field_2 = self.leDataField2.text() + if data_field_2 == "": + data_field_2 = "0" + if alarm_id: - self.alarm.cmd_set_alarm_triggered(alarm_id) + self.alarm.cmd_set_alarm_triggered(alarm_id, + field_descriptor_1, data_field_1, + field_descriptor_2, data_field_2) self.__append_triggered_row(alarm_id) @Slot()