From f1ddfb831a70560f06530ecf796b807b31afe15e Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 24 Jan 2023 14:57:40 +0100 Subject: [PATCH] minimized the changes --- grum/.vscode/settings.json | 3 --- grum/mainwin.py | 15 +++++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 grum/.vscode/settings.json diff --git a/grum/.vscode/settings.json b/grum/.vscode/settings.json deleted file mode 100644 index de288e1..0000000 --- a/grum/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.formatting.provider": "black" -} \ No newline at end of file diff --git a/grum/mainwin.py b/grum/mainwin.py index 6a5fcd2..d0b3841 100644 --- a/grum/mainwin.py +++ b/grum/mainwin.py @@ -56,13 +56,14 @@ class MainWindow(QMainWindow): rst.server.register_function(self.new_plot) rst.server.register_function(self.append_data) - self.sig_make_new_plot.connect(self.on_make_new_plot) + def keyPressEvent(self, event): if event.key() == Qt.Key_F1: self.webdoc.show() + # Remote API calls def new_plot(self, name, cfg): @@ -83,6 +84,7 @@ class MainWindow(QMainWindow): else: item.set_alarm(True) + # Signal callbacks def on_make_new_plot(self, *args, **kwargs): @@ -101,6 +103,7 @@ class MainWindow(QMainWindow): else: self.plot_multiple_items(selected) + # Plumbing def plot_single_item(self, item): @@ -109,17 +112,18 @@ class MainWindow(QMainWindow): self.activate_or_make_subwin(MDISubPlot, name, desc) def plot_multiple_items(self, items): - # TODO: unset alarm status for all items? + #TODO: unset alarm status for all items? pairs = ((i.key, i.value) for i in items) names, descs = zip(*pairs) name = " | ".join(names) self.activate_or_make_subwin(MDISubMultiPlot, name, descs) - # TODO: the following two could be methods to MDIArea? + + #TODO: the following two could be methods to MDIArea? def activate_or_make_subwin(self, MDISubType, name, *args, **kwargs): sub = self.mdi.findSubWindow(name) - if sub: # TODO check type? what to do for mismatches? + if sub: #TODO check type? what to do for mismatches? self.mdi.setActiveSubWindow(sub) else: self.make_subwin(MDISubType, name, *args, **kwargs) @@ -127,3 +131,6 @@ class MainWindow(QMainWindow): def make_subwin(self, MDISubType, name, *args, **kwargs): sub = MDISubType(name, *args, **kwargs) self.mdi.add(sub) + + +