diff --git a/src/__pycache__/main.cpython-310.pyc b/src/__pycache__/main.cpython-310.pyc index e3bc480..e844a7e 100644 Binary files a/src/__pycache__/main.cpython-310.pyc and b/src/__pycache__/main.cpython-310.pyc differ diff --git a/src/controller/__pycache__/controller.cpython-310.pyc b/src/controller/__pycache__/controller.cpython-310.pyc index 27d6a3a..f010284 100644 Binary files a/src/controller/__pycache__/controller.cpython-310.pyc and b/src/controller/__pycache__/controller.cpython-310.pyc differ diff --git a/src/controller/__pycache__/mediator.cpython-310.pyc b/src/controller/__pycache__/mediator.cpython-310.pyc index 759eebd..53ed495 100644 Binary files a/src/controller/__pycache__/mediator.cpython-310.pyc and b/src/controller/__pycache__/mediator.cpython-310.pyc differ diff --git a/src/controller/__pycache__/monitor.cpython-310.pyc b/src/controller/__pycache__/monitor.cpython-310.pyc index 61a2a16..5987012 100644 Binary files a/src/controller/__pycache__/monitor.cpython-310.pyc and b/src/controller/__pycache__/monitor.cpython-310.pyc differ diff --git a/src/controller/controller.py b/src/controller/controller.py index 9f5851c..2538061 100644 --- a/src/controller/controller.py +++ b/src/controller/controller.py @@ -7,9 +7,10 @@ from src.utils.base.base import BaseController class Controller(BaseController): signal_widgets = pyqtSignal(list) + signal_settings = pyqtSignal(list) def send_widgets(self, widgets: list[QWidget]) -> None: self.signal_widgets.emit(widgets) def push_settings(self, settings: list[dict]) -> None: - self._mediator.push_settings(settings) + self.signal_settings.emit(settings) diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index 216cde6..d656f10 100644 Binary files a/src/gui/__pycache__/mainGui.cpython-310.pyc and b/src/gui/__pycache__/mainGui.cpython-310.pyc differ diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py index e425638..f379c4f 100644 --- a/src/gui/mainGui.py +++ b/src/gui/mainGui.py @@ -1,13 +1,16 @@ from datetime import datetime as dt +from typing import Optional from PyQt5 import QtWidgets from PyQt5.QtCore import Qt -from src.utils.base.base import BaseMainWindow +from src.utils.base.base import BaseMainWindow, BaseController from src.gui.settings_window import settingsWindow class MainWindow(BaseMainWindow): - def __init__(self): + def __init__(self, + controller: Optional[BaseController] = None): super().__init__() + self._controller = controller self.initUI() self.set_style(self) self.settings_button.clicked.connect(self._show_settings) diff --git a/src/main.py b/src/main.py index 1527801..5a0228c 100644 --- a/src/main.py +++ b/src/main.py @@ -9,7 +9,6 @@ from src.controller.mediator import Mediator from src.controller.converter import DataConverter from src.gui.plotter import PlotWidget from src.controller.controller import Controller -from src.utils.json_tools import read_json def main(): @@ -18,14 +17,14 @@ def main(): data_converter = DataConverter() plot_widget_builder = PlotWidget() controller = Controller() - window = MainWindow() - mediator = Mediator(monitor, data_converter, plot_widget_builder, controller, window) - window.push_settings() + window = MainWindow(controller) + mediator = Mediator(monitor, data_converter, plot_widget_builder, controller) window.show() controller.signal_widgets.connect(window.show_plot_tabs) controller.signal_settings.connect(mediator.push_settings) + window.push_settings() sys.exit(app.exec_()) diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index a9ebe22..3c45168 100644 Binary files a/src/utils/base/__pycache__/base.cpython-310.pyc and b/src/utils/base/__pycache__/base.cpython-310.pyc differ diff --git a/src/utils/base/base.py b/src/utils/base/base.py index 054bb53..ecc60b0 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -230,21 +230,6 @@ class BasePlotWidget: ... class BaseController(QObject): - def __init__(self, - window: Optional[BaseMainWindow] = None, - mediator: Optional[BaseMediator] = None): - super().__init__() - self._mediator = mediator - self._window = window - self._window.controller = self - - @property - def mediator(self) -> BaseMediator: - return self._mediator - - @mediator.setter - def mediator(self, mediator: BaseMediator) -> None: - self._mediator = mediator def send_widgets(self, widgets: list[QWidget]) -> None: ... @@ -294,6 +279,7 @@ class BaseMainWindow(QWidget): controller: Optional[BaseController] = None): super().__init__() self._controller = controller + ... @property def controller(self) -> BaseController: