Skip to content

Commit

Permalink
Merge pull request #40 from jbellister-slac/minor_cleanup
Browse files Browse the repository at this point in the history
FIX: Minor cleanups
  • Loading branch information
jbellister-slac authored Feb 23, 2023
2 parents 32c5f0b + 7f50dad commit 8813d56
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='slac-alarm-manager',
version='1.1.0',
version='1.1.1',
description='Python interface for managing alarms',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down
5 changes: 3 additions & 2 deletions slam/alarm_table_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ def __init__(self, tree_model: AlarmItemsTreeModel, kafka_producer: KafkaProduce
self.plot_signal.connect(self.plot_slot)
self.clipboard = QApplication.clipboard()

self.alarmModel = AlarmItemsTableModel()

self.layout = QVBoxLayout(self)
self.alarm_count_label = QLabel('Active Alarms: 0')
self.alarmView = QTableView(self)

self.alarmModel = AlarmItemsTableModel()
self.update_counter_label()

# Using a proxy model allows for filtering based on a search bar
self.alarm_proxy_model = QSortFilterProxyModel()
Expand Down
2 changes: 1 addition & 1 deletion slam/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self, topics: List[str], bootstrap_servers: List[str]):

self.main_menu = self.menuBar()
self.file_menu = self.main_menu.addMenu('File')
self.applications_menu = self.main_menu.addMenu('Applications')
self.applications_menu = self.main_menu.addMenu('Tools')
self.exit_action = QAction('Exit')
self.exit_action.triggered.connect(self.exit_application)
self.file_menu.addAction(self.exit_action)
Expand Down

0 comments on commit 8813d56

Please sign in to comment.