From b73eba7f7e2caac248d3d528dcb41984b8a89494 Mon Sep 17 00:00:00 2001
From: Andrew <nazarov_a@diakont.ru>
Date: Wed, 18 Dec 2024 12:58:37 +0300
Subject: [PATCH] =?UTF-8?q?chore:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/monitor.cpython-310.pyc       | Bin 2557 -> 2543 bytes
 src/controller/monitor.py                     |   2 +-
 src/gui/__pycache__/mainGui.cpython-310.pyc   | Bin 3958 -> 4045 bytes
 src/gui/__pycache__/plotter.cpython-310.pyc   | Bin 9617 -> 9619 bytes
 src/gui/__pycache__/reportGui.cpython-310.pyc | Bin 4907 -> 5896 bytes
 .../settings_window.cpython-310.pyc           | Bin 5558 -> 5549 bytes
 src/gui/mainGui.py                            |  12 ++--
 src/gui/plotter.py                            |   4 +-
 src/gui/reportGui.py                          |  63 ++++++++++++++----
 src/gui/settings_window.py                    |   1 -
 10 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/src/controller/__pycache__/monitor.cpython-310.pyc b/src/controller/__pycache__/monitor.cpython-310.pyc
index 47083417f637ea3b855feb43429b3c10a9ba84bd..c222d517a446315976939b0096d526f70b071ccc 100644
GIT binary patch
delta 30
kcmew>{9c$hpO=@50SLV3B&FMJ<Sk}pVvOHBfi;%}0Dn9O@&Et;

delta 44
ycmaDa{8yMapO=@50SNY&C8hgp<Sk|u;Lk5eElMoOFN!ZnEK1BR-rU5R%K`u{Iu1+#

diff --git a/src/controller/monitor.py b/src/controller/monitor.py
index 75ab892..3ad8858 100644
--- a/src/controller/monitor.py
+++ b/src/controller/monitor.py
@@ -26,7 +26,7 @@ class DirectoryMonitor(BaseDirectoryMonitor):
 
     def update_settings(self, data: list[dict]) -> None:
         self.stop()
-        operator_params, system_params = data
+        _, system_params = data
         self._directory_path = system_params['trace_storage_path'][0]
         self._update_time = system_params['monitor_update_period'][0]
         self._init_state()
diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc
index b3ab3bdcf374efd703bd458da343aa63d6551b98..0a5cf6f6a54215d0325bcaec73d7991feb86c357 100644
GIT binary patch
delta 996
zcmZWoOKTHR6rMA4GfiePlSdy(T1~`iF`)RsD7dJiZ5AyJ!GeVr8PeQoJMEa%I}^2#
z(uD<gZtkie*n*obwF`CSFYpgs=*p!VH;Nmn=T0_#44iMiIrqEg#hE|F?<Ko!S%!ko
zubsu^AobBM0=(nbAZJsJ!V-C-ECD4n#%oZRi##+zjcqb-&=G3VBr+43MQvnBWGR|P
zW+BVaEHaz+yQy9*IzR`}lcqy7x2?=)P?M*HZNk66<+#w98+KUh;1J3xq<9~x988c9
zV32=}RfhYqL}3MPSoL1Hbk3vU3d^C76?j~)K#7m*Bk7CM5y7ZrnFCM%0eChOzcnlp
zVPny0wmYp*fY(#?q<kk%w+LR4_6RMwhtP#xWlsrVRb5kAp{uNFyJSz<RKpmBuKHS?
zP@X0>wXU+OceOnL<#~oGvx>B`T4R6_%6&pxb2nHFxzMNG4X0XRSMY<4OSmtgj8G=5
zG=XoSHf}IU*rbG$%?Jxa)tMUvlP}y>_y83_62S%oY)At6M^xTP)Nk%Xt*o(gcqB-$
z(tgR#Bi#p9!q=&oYzTc-{x|XX`ZTgKun{SmIja=bdM8+MaQvayS`Mc8hS8}+clx4^
zM6Bt%4c1GWSa!pDgEgK7QErx&@oF-G#!7tDyfkpKwJ7ThUoe|6&A*xXVpQtv*(#!G
z&GO&oKBW2kWPVHv=gp<IPhIA$H*h6RMb4w(2|rAJxKl(XVv8Nmr*hsh_(KV|B~&Dw
zx;l)$1^(H(8jt!^S(5*>DqATj%^(QkdqK$L&ak@@suHFo$gxHZN1X}HYlTtiOqRoB
zU|~5<({BVp)AfDFIhOl^ltkMr|4M0rbj1}_B}Y2s)FTz_Bg4uM8CgR&h@oZmxR&Lg
Q?6=3(Kk8+a*HdHv0b%LR=>Px#

delta 973
zcmZWo&rj4q6z;U$(spTCSAOiWx<vdDH^E5M$_<SQK@oyTLhPmK?#x1=v}9(AVobPf
zV&cJrbMdIr#Beb&{0Dl~gV$b7yn6ErGqWTDHhEuX-uvG7-n>qKjQp*;spHs+c-}Tw
ze!E}XIsk9j6)-f}R$nS@05zz09KQf-(11N1-8Z0#dXTwhRTWr(pshm-+T3r$BJAxb
zei1s*?I`ROsMWghemKD6B{&F&c>ENsz$%Y_1sC`JfQAZOR@FT-H!z|ZPWI+?3P3;m
zR`7<)ysO+Hh)ze(5L}KRUB!dkhbydXcw==DHsWwQ&8Y7*GfLAW=x*^jL6a~lR;4{+
z`~slPmd$I!zD2`k&`Ps}<{&ysWgkqqqw)k{ce#-YhZo?T@?N1}O<h;9Z7EQBENvIe
zH?&+^N87l-X}K|rwu5P}p<>yY8jc^;77T}T7ce4ZY6~UwHg^$&g9{9x??121g;BE1
zep>gh<7w`0Xt>5-xlUHor}zwC?gA-&LKYA3&^<P5FJ6^t01tBqekkDh9CBwfBdY<Q
zD2<X8GQ+;xnJ064@MTWV3#}N1xLej*L3AO+;Rcblai7qe<G}l>v#sKV{^R1Z>MZ+Q
zY)wc>RZ996MjPoCS_+$ogTagcH-;PB_lV8(?%on*@>05qlAx6lnr;N`C`O05ezBd#
z5aD1m<agmj{UM&Y#KxVEH_r-<LNkkE*wDKpyTe`hh5%2%iPS3hJz=&xW*)YFo=v*m
zjw`4o4!IsjgkoLnCj?9hcpyLwUyendKi8s!%F|%c4i>_>69la|B&3DnI0%l^9uX9I
wLB%g9jEK){DypjQ8{o9NZ#$Jivux_NZfj-3)Jn|idtLh1y<Cm5PkomT0IJE*l>h($

diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc
index d524b62282216b3f91c0faf9aaafb4a12022e7dc..d6427a321a823af462887d7179c1ecf6b49759cf 100644
GIT binary patch
delta 46
ycmbQ}J=vQ#pO=@50SF}LB&EOE$h%*Gv1s#I1p&s%eo{P>UnpvV=*==prOW_5xDCPp

delta 60
zcmbR2J<*#tpO=@50SF=|CZ)gH$h%*Gv0(FA1p!8`lGNgy#Q2iT+|<c06t$4Jn`M>C
Fm;p%=6iNU9

diff --git a/src/gui/__pycache__/reportGui.cpython-310.pyc b/src/gui/__pycache__/reportGui.cpython-310.pyc
index f68774832afb9473f12e5b3ad096e9451bc289f7..6dc859861003832b29e5358eb010cc13d124ef0a 100644
GIT binary patch
delta 1541
zcmb_cU1%It6rOu$XLfcbnQYqBs4Y4bs;-n43Pn^bMa+YWK~2#IK}gwcMX+7(W(q9{
zn@t;9SY-+Kp$|S}m(V9gHa}a(Y_kFJMSQsz--7hXXAyi5#3udD-A&S#qJ8KrbLZT1
z&pqcm-#KT$dH&jw@O*#2Z{hjp>(gid*gqF8`W|*C@s@s{`}w(aluzfqE2+6Zr`^1r
zPo43kV6U))@>}*(*&DNRnOMM9HB?7^uU1r3we(E%-nbb5yf9G^r$nI;LEYB1NPnf;
zs-<q>UDGqLUy9U{uHeFKq?YxxYU(R0QLEc0RkcV;wT53u{QzT}wV_zSH`#ED@*@9*
z4a*Vx1RIr??OzW(4J00Sna6zQ*&a)6W*wJhS!ye^<+;>InZ-=JFv;qyVTnWd@;q;_
zDL%>TcEifk>9bwAo@!Xk>ROh<JR8I5m^EqDoe8&|ZdeV*j3#HtiwNpRy+_Rhass3s
zpiIC7#026^Lra-bURIrM_ONM1YBe%RE*fns0v{b+Ap>1Q-ic}**>%1EPfg;|c<Yj9
zZb09Ho13t|MQ#sA*jGSS5*byCF6c_2Ydg-Q>s$y9P?@vDnj^0|Q*Xs@LhjX)c&1vy
zZ_7me5@o9rWaAWv_i3q+YSjRr)>Y}aaqtqH{YA}{a^$Q#`(gb4uJ`Ruc|`A&ilGCs
zA7~XBq%Q==;aMERa_Nw)xlhR(=}TPC$b()jI0<d3hobE*l;h8!=;gSBqN3JOE^v=}
zsC5Hs#gw6m0#eta33U~X`j95p6;MJwyp9g0hDC>i?XHvvhHxUFr4LI^p3mficOaE$
z3ubO-ZV$f(QOzTITVK{!;ev=)Ys)|SMHYNS##E`$k+1jtUC3bS{P<(Kavi4IIXoC%
zS04rz9ca>|9$e~ng^?0e6^RsSaA|1etNkzfqq&rzB5n-HquG6Oy8l{mj=&6I$)=b0
zh6AkkA8_VT(A?7@NR_7lKe2%GCe;8;V*D}l#B3toKqxUn%iCDw%LDr{{T~e62xhP?
zJ%c6dN}m0<?0_dXJ`KhH@r1rLQ)?>xI8cdCEQ?#C^2x!;;5xyg@&VTT;E6OB8Ei)7
zZ-WbEqRq3O;Qn47a>lnf^S5|#zvS-djMNvx&Pc<?j`K}!^E=%3@9?1=4fi+szTI88
bDO`lg1sj>-#V;n#it*y7;$2IAw`b}u1hUVY

delta 477
zcmXv~J4*vW5Z>8bE}OgLT;knf4$<H%KETFGL=h#8#WjL<A`%sB42cOM30NrD#bg?r
zz@4IvmD-9Rh+rcDd;J4~5D^;@cQ3fhd^<beJa)gM@yj7&J091FScfNTo5Oa^xYAT{
zn-x}gtv&UHBUyGpYOQ^`q2ew~LJF_pK_!c1gt^$F&tTzwXr`{bblIYYfeH*XU?B#|
zFAqCl0DdT$MN))(x(pupBtIxlngt&!v`oE_PqLEjZTp_$6Cmx(f{_)2q?L&m-ch}X
zPkewNGD2}$E$K=5P##RiJGBBX9z=>(zX*KFZz<FS6WFh!?DgYnG>K`pCUV|b3C3_K
z+Mvx_{EAlf3E8GyfK}~Gr1<)dJ|&|u*#<BbdsRn;+icue@f_&$lIs>=P&_ui14W`P
zzIP0x#V_<_Nt*&V+&uCQ_*X2G7{y%TTwj-bPrzfU^T&~bhTZ&}h~zU879^|)z=m1Y
ki^2(}alip<2DhwJC(xVNl<|a?V7AzO%r<Sq;aIZke@!Z9D*ylh

diff --git a/src/gui/__pycache__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc
index a24e1f0db4ca346b309b3ea2a557d3d089864c68..1e2df39e265c260b98ef7a7c79e36077c9538206 100644
GIT binary patch
delta 111
zcmdm{y;hqypO=@50SMgYB&9oU<lV`{XgB#dQ^sZs<^zn3?2~`8{9}}#{Dbu=qx$4~
zY=;=NH!oy=!^Eh+xsNNDiP2~CBc6jyj47L!@Cz|Ac5U7+uz`uOe{zQK8%E*Hp(0_7
P+&UbLTtLXf$npmOzpf$t

delta 111
zcmZ3hy-k}ppO=@50SMNYC8c|B<lV`{=sx*4Q^saB=97$!9Fsq={9{y@{GRnGqsHW`
zY=;<iHqT&x!^CK?xs@xJiP3lSO`d~HjH#Pv^9wODc5hxMuz`tj!sK}2H;f{ieMG_-
Pxpg@hxqy&|k>w8n&i5hu

diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py
index 5223802..83813f0 100644
--- a/src/gui/mainGui.py
+++ b/src/gui/mainGui.py
@@ -9,7 +9,7 @@ from gui.reportGui import ReportSettings
 
 class MainWindow(BaseMainWindow):
     def __init__(self, 
-                 controller: Optional[BaseController] = None):
+                 controller: Optional[BaseController] = None) -> None:
         super().__init__()
         self._controller = controller
         self.initUI()
@@ -61,11 +61,13 @@ class MainWindow(BaseMainWindow):
             for i in range(0, tab_count-2):
                 self._close_tab(i)
 
-    def keyPressEvent(self, a0):
+    def keyPressEvent(self, a0) -> None:
         if a0.key() == Qt.Key_F5:
-            pass
+            tab_count = self.tabWidget.count()
+            for i in range(0, tab_count):
+                self._close_tab(i)
 
-    def _show_settings(self):
+    def _show_settings(self) -> None:
         self.operSettings.show()
         self.sysSettings.show()
     
@@ -86,7 +88,7 @@ class MainWindow(BaseMainWindow):
         if folder_path:
             self._controller.open_custom_file(folder_path)
 
-    def _report_window(self):
+    def _report_window(self) -> None:
         tab = self.tabWidget.currentWidget()
         reg_items = tab.property("reg_items")
         curve_items = tab.property("curve_items")
diff --git a/src/gui/plotter.py b/src/gui/plotter.py
index 0f8e0bf..6abeaf2 100644
--- a/src/gui/plotter.py
+++ b/src/gui/plotter.py
@@ -270,8 +270,8 @@ class PlotWidget(BasePlotWidget):
         Создает набор виджетов по предоставленному списку данных.
         Предполагается, что data — это список элементов вида:
         [
-            [dataframe, points_pocket, tesla_time],
-            [dataframe, points_pocket, tesla_time],
+            [dataframe, points_pocket, useful_data],
+            [dataframe, points_pocket, useful_data],
             ...
         ]
         """
diff --git a/src/gui/reportGui.py b/src/gui/reportGui.py
index 79293e9..65ec102 100644
--- a/src/gui/reportGui.py
+++ b/src/gui/reportGui.py
@@ -7,6 +7,7 @@ from PyQt5 import QtWidgets
 class ReportSettings(QtWidgets.QWidget):
 
     def build(self, reg_items: dict, curve_items: dict) -> None:
+        """Создает ParameterTree для элементов всех графиков выбранной вкладки"""
         self._clear()
         param_tree = ParameterTree()
         layout = self.layout()
@@ -18,11 +19,17 @@ class ReportSettings(QtWidgets.QWidget):
             ]
         # Добавляем параметры в дерево
         params = Parameter.create(name='params', type='group', children=body)
-        params.sigTreeStateChanged.connect(lambda: self._update_settings(reg_items, curve_items, params))
+        params.sigTreeStateChanged.connect(
+            lambda: self._update_settings(reg_items, curve_items, params)
+            )
         param_tree.setParameters(params, showTop=False)
         self.show()
 
-    def _clear(self):
+    def _clear(self) -> None:
+        """
+        Приводит виджет в готовое к работе состояние.
+        Удаляет все содержимое, если имеется
+        """
         main = self.layout()
         if self.layout() is not None:
             while main.count():
@@ -32,7 +39,10 @@ class ReportSettings(QtWidgets.QWidget):
         else:
             self.setLayout(QtWidgets.QVBoxLayout())
 
-    def _generate_reg_params(self, reg_items: dict) -> dict:
+    def _generate_reg_params(self, 
+                             reg_items: dict) -> dict:
+        
+        """Созадет реальные и идеальные секторы"""
 
         res = {'name': 'Sectors', 'type': 'group', 'children': [
                 {'name': 'Real sectors', 'type': 'group', 'children': self._create_samples(reg_items["real"])},
@@ -40,7 +50,10 @@ class ReportSettings(QtWidgets.QWidget):
             ]}
         return res
 
-    def _generate_curve_params(self, curve_items: dict) -> dict:
+    def _generate_curve_params(self, 
+                               curve_items: dict) -> dict:
+        
+        """Создает реальные и идеальные линии графиков"""
 
         res = {'name': 'Plots', 'type': 'group', 'children': [
                 {'name': 'Real plots', 'type': 'group', 'children': self._create_samples(curve_items["real"])},
@@ -48,15 +61,22 @@ class ReportSettings(QtWidgets.QWidget):
             ]}
         return res
 
-    def _create_ideal_curves(self, curve: dict) -> list[dict]:
-        """Создаем секторы с этапами циклограммы"""
+    def _create_ideal_curves(self, 
+                             curve: dict) -> list[dict]:
+        
+        """Создает секторы с этапами циклограммы"""
+
         res = []
         for key, item in curve.items():
             param = {'name': key, 'type': 'group', 'children': self._create_samples(item)}
             res.append(param)
         return res
     
-    def _create_samples(self, sector: dict) -> list[dict]:
+    def _create_samples(self, 
+                        sector: dict) -> list[dict]:
+        
+        """Создает список представленных элементов с их параметрами"""
+
         res = []
         for key, item in sector.items():
             sample = item[0] if type(item) == list else item
@@ -64,8 +84,11 @@ class ReportSettings(QtWidgets.QWidget):
             res.append(param)
         return res
 
-    def _create_settings(self, item: Union[pg.LinearRegionItem, pg.PlotDataItem]) -> list[dict]:
-        """Настройки для элемента"""
+    def _create_settings(self, 
+                         item: Union[pg.LinearRegionItem, pg.PlotDataItem]) -> list[dict]:
+        
+        """Получает настройки для элемента"""
+
         if type(item) == pg.LinearRegionItem:
             pen = item.lines[0].pen
             brush = item.brush
@@ -84,7 +107,13 @@ class ReportSettings(QtWidgets.QWidget):
             {'name': 'Fill color', 'type': 'color', 'value': fill_color},
         ]
 
-    def _update_settings(self, reg_items: dict, curve_items: dict, params: Parameter):
+    def _update_settings(self, 
+                         reg_items: dict, 
+                         curve_items: dict, 
+                         params: Parameter) -> None:
+        
+        """Задает параметры элементов в соответствии с paramTree"""
+
         real_sectors = params.child("Sectors").child("Real sectors")
         ideal_sectors = params.child("Sectors").child("Ideal sectors")
 
@@ -98,7 +127,12 @@ class ReportSettings(QtWidgets.QWidget):
         for key, item_dict in curve_items["ideal"].items():
             self._set_plot_settings(item_dict, ideal_plots.child(key))
 
-    def _set_sector_settings(self, sectors: dict, settings: Parameter) -> None:
+    def _set_sector_settings(self, 
+                             sectors: dict, 
+                             settings: Parameter) -> None:
+        
+        """Задает параметры секторов в соответствии с настройками"""
+        
         for key, item in sectors.items():
             sample = settings.child(key)
             line_color = sample.child("Line color").value()
@@ -114,7 +148,12 @@ class ReportSettings(QtWidgets.QWidget):
                 reg.lines[1].setPen(pen)
                 reg.setBrush(brush)
 
-    def _set_plot_settings(self, curves:dict, settings: Parameter) -> None:
+    def _set_plot_settings(self, 
+                           curves:dict, 
+                           settings: Parameter) -> None:
+        
+        """Задает параметры кривых в соответствии с настройками"""
+
         for key, item in curves.items():
             sample = settings.child(key)
             line_color = sample.child("Line color").value()
diff --git a/src/gui/settings_window.py b/src/gui/settings_window.py
index 416fad3..d81e302 100644
--- a/src/gui/settings_window.py
+++ b/src/gui/settings_window.py
@@ -12,7 +12,6 @@ class settingsWindow(QWidget):
     def __init__(self, path: str, name: str, upd_func: Callable[[], None]):
         """
         Окно настроек для редактирования параметров.
-        
         :param path: Путь к файлу настроек (JSON).
         :param name: Название набора настроек.
         :param upd_func: Функция обновления (коллбэк).