From 056d9fedb8aef7bb650149f8a5ed78ef77952506 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 26 Nov 2024 18:28:05 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D1=81=D0=B2?= =?UTF-8?q?=D1=8F=D0=B7=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/__pycache__/main.cpython-310.pyc | Bin 1113 -> 1146 bytes .../__pycache__/controller.cpython-310.pyc | Bin 698 -> 894 bytes .../__pycache__/mediator.cpython-310.pyc | Bin 1227 -> 1237 bytes .../__pycache__/monitor.cpython-310.pyc | Bin 2132 -> 2132 bytes src/controller/controller.py | 3 ++- src/gui/__pycache__/mainGui.cpython-310.pyc | Bin 2498 -> 2623 bytes src/gui/mainGui.py | 7 +++++-- src/main.py | 7 +++---- .../base/__pycache__/base.cpython-310.pyc | Bin 11086 -> 11271 bytes src/utils/base/base.py | 16 +--------------- 10 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/__pycache__/main.cpython-310.pyc b/src/__pycache__/main.cpython-310.pyc index e3bc4809541b8c0ce5404d3dce6c972519110706..e844a7e807a5cea455e0d40f7ff16170fb5d5dbe 100644 GIT binary patch delta 209 zcmcb~@r#2upO=@50SFGia819kkvEW$ixtRo2IAt1$r+5A;WaGHjJ2#KoHdL!Of}3v z9!o7-4eJ7~g$#@gH7r@&3wUZ+vv?OWf_Z#E9$OYan8&(+AEc&)X@Niu!vevD3?R`I zhF}IwMn6rV$+sA7C#x~($w%=QXQt;R=EN7LmXu`Xr58u>7L*oez_^oxnU={&0G-3b e$OeTRjC_nh%mgHvgqSu9GdnV}3UM*A{09JXnlS(X delta 176 zcmeyxag&2LpO=@50SK}hT+;hC@&+<;u>pC`KwO+PIfGHtvzeimwS=>Vv4*LJxrU{N zwVAb+t%h|0*FpwH1|ZE1rdhIh7Vy@vX7Md#WMn8|TEJh!us~oT1BjQx5X_*-=%*<- z`30jbA8$cvaYlS`YDr0EUV8Cl6(;@3#Y{`3#DMnkFtWj+03!zw@-Yc9Z#H3eWMmcO IVr2Ob05%3DCIA2c diff --git a/src/controller/__pycache__/controller.cpython-310.pyc b/src/controller/__pycache__/controller.cpython-310.pyc index 27d6a3a959c8e427862a1775b88636e9c7061ffc..f010284da0ad2ec506cb3aa4f3afe409a3a8a615 100644 GIT binary patch delta 418 zcmdnR`j3q_pO=@50SGofcTGP#k$0(|2auD>5XG3n5XF?roXXP77{v;u*-{u&SyI_0 z8B&;1nA2ENSW;M9SfV&m*npy(a8dRY4xlJk3Ue@nCg;RQ=3<`(fJW9ZWHBsYtYKWp z$jFew5X`W0vOc30Bk$xW#!x*Tp!{bhAR)k5CGMP`S5lOplapGcSDc!c5?`K~lAc;p ze2b$vwWK67FTHpYqhx&%2T*kpCy>x&y2W3dnVy%J6Ax2R#0?fN0vTH*2qJjl1Rs!f zi?^V(I0LSnA0!EKVwD7v-6%>lxo>gA$LA&HrpCwL;);)-{FqV63lwZcLLdU<^dgWk zw^&j#lS_((L41UrU>3;YB32;54#dSEy&Mc2OdO12Oj68~t(gJ^(A7_#!z2d)m;+z- delta 229 zcmeyzwu_ZFpO=@50SHnXT++=Z@-8*d0&y6k7*iOcm{OTjS(+K6SW_5NSyI^~8B&;1 znA2ENSW;M9Sfbcdn1dNK*(NcXixmq1HPtX=F)U!LVO+?_$dJMSl$z|zsKv-Vxq>lN zjT_A-11|&EbIGCiECjVy&6hK!yIe}RY0L`WlK&#?lG^id7aS delta 77 zcmcc0d76_qpO=@50SHW5T+(N4B;Smt$%(vugmh)-5#(P31a9Kg~F0I%E@~ 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 216cde6aa43e0a694f8d6f9892327c41c8ff97f2..d656f100f87089533a0363a5ab8fdc6c37bf1616 100644 GIT binary patch delta 1231 zcmZ8gOK%)S5bo}I&(4gUWCJ$D;E*_Yi4=^Hg+L@cOt8emu@gk3y$r*4doyOdv+5pW zEwW@JTM8UkeMZ^{E?hXm5yW5M)>kgv_yb6xs#nUxGwN@uy6f>(bho3Z%A-4^6OX@bN8znu zQ`Uo`8jsr-naSQSl=!qL2Y1T>uMejBdOc`lT~$Jkf4y|%VMch=5I~SF<)q6Z%Fl5o z9O2HB9d@7WQ0{Q|B<*^<&3zu6xLqHT2O`{!<_Y&W-En!uW7v;*izg?f+u|wD;G2NQ z44;LQ6r?l!EJ)dX;*#zRkUoE8;>Y|pP277#uE#8|DWL4aa$u>?0UB~lCiDTJL2y56J@x`()SK^(O&*L)4pyQx0~!@v#FQEzqH+_|Zn9|Dd;DOpT}ZheDb# z&&xsCEf8CQvFN8+97pV&vUDF~>j36Eh zp3(n0ix=nM%=lF?s`nfDJSbDRfYJ;=Td%l(UBOySuzk1WebJcK_J%C^CsUu7&~gc3 zQFpx8-@}0NWwdV%tGdY#ran$nd}-W1_?^mPGIg&$$gM5ds0ICl_sw-21LJ=zM)`+p z#_Lt0kR2v1Syrr^4v~H(Mq5%Sb@OX6Xs+nb{Css4B6J-23TxJx+f+b?yGyb5=~PM`s$kI!CH*nS%;-o^^d{Q2NNG=fb|*P zGADP4v@rv@h~d@{EU5@uxmCzwPg!OXZ%Mud0IcWqbK&JnPp7t=UW0QL0>l*Gwl2aK zW~K?4T!8(}&aD1ETsp$ZlmP;cfxSxOR;6krvX#pS7)-u_fc4wlHi=2|yjK-U^+Z+W z`4cUeM>{(k5lFZc))ErN+=o8R9>(!p6h@)@PVAm_BpPgXGKs&7yb56aW;BGxNu+1I zt08mf@1t9w%V^;SmTbd4LB_TR$(Zo%y_)Y=;syoHj(b89 Mny`e<(uB6z{{p-Uj{pDw delta 1192 zcmZ`(&2JPp6u0MlW@onKgEUZ3TOchfq$L8vsZ@NFMk+MjO%F&bRn}zfY$l!TMz*(6 zP(%*digG|A@;?xcT&o@{RpP)u(3_9^AC>x^(-st|Gn${@v){+h&(HJ6?CY84s3;Dvlr5?epK;+(5gkP*VTZ{ zyQLD}meuf4HRPk6!?zdr1B?ofS_2TIM>*+vPsuvvlzWq;=ksYE@@NwD0!R^xXfr-T zxX*+2fG0eK`GjY@F(JK_=e&S11CJ*E09G0xo#Im<G<%e4uB>Hjtnh~h`F+mS-4`#*`HzG!}n*y2@)(DLOp1`05RoB>hJBAnRgDVY1* z+>ckUIwvZp{>Rc5+heuCl+d~w4%8L%CSJ<0HuvCDH%yo;tZqhobk7@joIZym1B} zjN&^-AAj_&E!%9o4H<=GT2_OB!1A31+m%++yiFGNu{qoU+n}zLmbeSKfPi7;4Fs%< zW8n&73&sZ?LoHDm7;aSrWV$HX8ZBZaOB$!V6%r%9RwSupKOTwQ53q({g;k(WWU zVQ06imt1z6JGtG}_eN4k*8ww1_S<7!)vCP)*WQ5)!Lj!tt_;Ri``^QWM#KMsj9}Ge gdXJzh9ul<47h5AfuEpG!cvIcY$Vu+y6yI6zZ%e2OkpKVy 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 a9ebe229704795cebc7b36be948db0cf2964c7b2..3c45168424a855997e6cb2d4e58044b17fa24ec7 100644 GIT binary patch delta 4060 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 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: