SwissFEL/grum
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed append logic from DictListWidget, better use DictListItem directly, no need for factory anymore

Browse Source
This commit is contained in:
augustin_s
2022-12-21 18:00:16 +01:00
parent 00875bd209
commit 7e68e5a966
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
grum/dictlist/dictlistwidget.py
View File

@ -6,9 +6,8 @@ from .dictlistitem import DictListItem
class DictListWidget(QListWidget): class DictListWidget(QListWidget):
def __init__(self, *args, factory=list, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.factory = factory
self.items = {} self.items = {}
def update(self, data): def update(self, data):
@ -16,18 +15,15 @@ class DictListWidget(QListWidget):
self.add(k, v) self.add(k, v)
def add(self, key, value): def add(self, key, value):
self.prepend_item_if_missing(key, value)
self.items[key].value = value
def append(self, key, entry):
self.prepend_item_if_missing(key, self.factory())
self.items[key].value.append(entry)
def prepend_item_if_missing(self, key, value):
if key not in self.items: if key not in self.items:
itm = DictListItem(key, value) self._make_new_item(key, value)
self.items[key] = itm else:
self.prependItem(itm) self.items[key].value = value
def _make_new_item(self, key, value):
itm = DictListItem(key, value)
self.items[key] = itm
self.prependItem(itm)
def prependItem(self, itm): def prependItem(self, itm):
self.insertItem(0, itm) self.insertItem(0, itm)

7
grum/mainwin.py
View File

@ -18,7 +18,7 @@ class MainWindow(QMainWindow):
self.setWindowTitle(title) self.setWindowTitle(title)
self.setWindowIcon(assets.icon()) self.setWindowIcon(assets.icon())
self.lst = lst = DictListWidget(factory=PlotDescription) self.lst = lst = DictListWidget()
lst.update(exampledata) lst.update(exampledata)
lst.setAlternatingRowColors(True) lst.setAlternatingRowColors(True)
lst.itemDoubleClicked.connect(self.on_select_list_item) lst.itemDoubleClicked.connect(self.on_select_list_item)
@ -49,11 +49,12 @@ class MainWindow(QMainWindow):
def append_data(self, name, point): def append_data(self, name, point):
self.lst.append(name, point)
item = self.lst.get(name) item = self.lst.get(name)
desc = item.value
desc.append(point)
sub = self.mdi.findSubWindow(name) sub = self.mdi.findSubWindow(name)
if sub: if sub:
sub.plot.setData(*item.value.data) sub.plot.setData(*desc.data)
else: else:
item.set_alarm(True) item.set_alarm(True)