use Description base class; change callbacks to concrete arguments

This commit is contained in:
2023-04-17 22:46:56 +02:00
parent 023ecd7618
commit f80a7759fb

View File

@ -2,7 +2,7 @@ from PyQt5.QtCore import Qt, pyqtSignal
from PyQt5.QtWidgets import QMainWindow, QSplitter from PyQt5.QtWidgets import QMainWindow, QSplitter
from . import assets from . import assets
from .descs import DESC_TYPES, PlotDescription, ImageDescription from .descs import DESC_TYPES, Description, PlotDescription, ImageDescription
from .dictlist import DictList from .dictlist import DictList
from .exampledata import exampledata from .exampledata import exampledata
from .h5filedlg import open_h5_files_dialog, save_h5_file_dialog from .h5filedlg import open_h5_files_dialog, save_h5_file_dialog
@ -22,8 +22,8 @@ DESC_TYPE_TO_MDI_SUB_TYPE = {
class MainWindow(QMainWindow): class MainWindow(QMainWindow):
sig_make_new_plot = pyqtSignal(str, PlotDescription) sig_make_new_plot = pyqtSignal(str, Description)
sig_make_new_image = pyqtSignal(str, ImageDescription) sig_make_new_image = pyqtSignal(str, Description)
def __init__(self, *args, title="grum", host="localhost", port=8000, offline=False, add_examples=False, window_mode=MDIWindowMode.MULTI, **kwargs): def __init__(self, *args, title="grum", host="localhost", port=8000, offline=False, add_examples=False, window_mode=MDIWindowMode.MULTI, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -166,11 +166,11 @@ class MainWindow(QMainWindow):
# Signal callbacks # Signal callbacks
def on_make_new_plot(self, *args, **kwargs): def on_make_new_plot(self, name, desc):
self.make_subwin(MDISubPlot, *args, **kwargs) self.make_subwin(MDISubPlot, name, desc)
def on_make_new_image(self, *args, **kwargs): def on_make_new_image(self, name, desc):
self.make_subwin(MDISubImage, *args, **kwargs) self.make_subwin(MDISubImage, name, desc)
def on_dclick_list_item(self, item): def on_dclick_list_item(self, item):
self.plot_single_item(item) self.plot_single_item(item)