From 4c79aba8a44087d48659a678675211a88953bf2d Mon Sep 17 00:00:00 2001
From: Andrew <nazarov_a@diakont.ru>
Date: Wed, 18 Dec 2024 15:08:23 +0300
Subject: [PATCH] =?UTF-8?q?style:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?=
 =?UTF-8?q?=D1=8B=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gui/__pycache__/mainGui.cpython-310.pyc   | Bin 4045 -> 4049 bytes
 src/gui/__pycache__/plotter.cpython-310.pyc   | Bin 9862 -> 9875 bytes
 src/gui/mainGui.py                            |   4 ++--
 src/gui/plotter.py                            |  16 ++++++++--------
 .../base/__pycache__/base.cpython-310.pyc     | Bin 20001 -> 20026 bytes
 src/utils/base/base.py                        |   1 +
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc
index 0a5cf6f6a54215d0325bcaec73d7991feb86c357..273f46fb5c3bf02b0438f351dabaf550a062bbd2 100644
GIT binary patch
delta 221
zcmX>re^H({pO=@50SKP#N=h%<$a{xHn0+B5BSQ(p0=|U|wM;ck3;0twCjVh^WaOM|
z$EqX3=UiG`lAoJdm8wvdnOgpGCs6O^D%Kb#M)k?p+4Z<}fczpO5TQ9)fWux;3&_;u
zDv}3@m;i~W$q5{yY^ETt+2m@DF9Mn%rag#o01;Z7>p4#{GHOot<US81C3&<MwKlu(
rq%rbB^Z?apvI5QC&T9%Y<rD8TMvKXvd`gU3lh^R&FxpI(<lh1SE%P;=

delta 233
zcmca8e^#D1pO=@50SG?KOiC}_$a{xHm~|l|BSQ(p0=|U|wM;ck3;0vmC;wq_WaOA^
z$EqX1@1B~MT9jCls!)_#kY7}?xsEl4iBWCxZFW6wZJ;?th9E*?vIvL0jwX<)$yFo|
z5-|o6x3~*(@=M~&GgH!2OK!12=pqx4wCUt}jxPclAf_FNum=&Eo0~aLGBRpR_T@eg
zBxQND7&SM0@T4*FLi7ODXtDzB+Rbaq1~ugy?=(j9$-R6^jGB`-@Z~UCPnPB10suF)
BJWl`s

diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc
index 9f7357b4de4862dbf3347eabd372c5f42e612353..fe637426eeaed54698da4696ecaf3a7689cb2b70 100644
GIT binary patch
delta 178
zcmZqko$Sk(&&$ij00iMXlhR*WY~-6S%BVGYooE*0y3LYeKFnG*EDI!R1Z((G_!lxW
zG87thFfLH2(XP>1$P~j=t6QsAqnn~t$~b|kh<kFYq`tg%icSmXLPkc08s-HmH7sBj
zQw?hkTN-mPgQo80%aU`M82?T#lu2gv+k8dlJTv2_$x9S`7?~!2RB)AMVqs)qWNHv&
c=3-=H<YMMx5?~Zy5@6zD6k^=$uV~H+09Cs!G5`Po

delta 142
zcmbR2+vdxc&&$ij00c9(C#45iZseOU%BV1TooE*0w#|}aKFkUoj0+TMv}<%0GQ}{}
z>elMjuq=?M5v<`$;a|wi$WUlBxnEMBSt~_*@<B;yMxD)fCFe3R{+nDalf3!9%z0+U
t4U^X^_%Je0{-fY3$;bkPObuepT#RgtT+Ccd0*nGo0!%_on`0EsSpjd!C2s%#

diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py
index 83813f0..7597dde 100644
--- a/src/gui/mainGui.py
+++ b/src/gui/mainGui.py
@@ -32,8 +32,8 @@ class MainWindow(BaseMainWindow):
         self.settings_button.setFixedWidth(160)
         self.select_dir_button = QtWidgets.QPushButton("Open directory")
         self.select_dir_button.setFixedWidth(175)
-        self.report_button = QtWidgets.QPushButton("Generate report")
-        self.report_button.setFixedWidth(175)
+        self.report_button = QtWidgets.QPushButton("Customize view")
+        self.report_button.setFixedWidth(185)
         button_layout = QtWidgets.QHBoxLayout()
         button_layout.setSpacing(2)
         button_layout.addWidget(self.settings_button)
diff --git a/src/gui/plotter.py b/src/gui/plotter.py
index 510de8d..58e1d03 100644
--- a/src/gui/plotter.py
+++ b/src/gui/plotter.py
@@ -193,7 +193,7 @@ class PlotWidget(BasePlotWidget):
 
             # Итерация по точкам
             for cur_point, point_data in enumerate(points_pocket):
-                # point_data структура: [point_timeframe, ideal_data, point_events]
+                # point_data структура: [point_timeframe, ideal_data, point_events, useful_p_data]
                 point_timeframe, ideal_dat, point_events, useful_p_data = point_data
                 ideal_data = copy.deepcopy(ideal_dat)
                 
@@ -214,7 +214,6 @@ class PlotWidget(BasePlotWidget):
                 if settings["stages"]:
                     self._add_stage_regions(plot_item, point_events, dataframe_headers, reg_items, 75)
 
-                # TODO: подобрать не вырвеглазные цвета, возможно ограничить зону
                 if settings["workpiece"]:
                     x1 = point_timeframe[0]
                     dx = point_timeframe[1] - x1
@@ -259,6 +258,7 @@ class PlotWidget(BasePlotWidget):
                     TWC_time += TWC_delta
                     ideal_time += ideal_delta
                     curr_perf = ideal_delta/TWC_delta if TWC_delta != 0 else 1
+
                     if curr_perf < worst_perf:
                         worst_perf = curr_perf
                         worst_timeframe = point_timeframe
@@ -274,13 +274,13 @@ class PlotWidget(BasePlotWidget):
             if settings["performance"]:
                 self._add_performance_label(result_layout, TWC_time, ideal_time, tesla_time)
             
-            navigator, ROI_region = self._create_navigator(worst_timeframe, main_plot)
-            
             plot_layout.addItem(plot_item, widget_num, 0)
-                
-        plot_layout.addItem(navigator, widget_num+1, 0)
-        self._sync_main_plot_with_navigator(main_plot, ROI_region)
-        main_plot.sigXRangeChanged.connect(lambda _, plot=main_plot, region=ROI_region: self._sync_navigator_with_main(main_plot=plot, region=region))
+
+        navigator, ROI_region = self._create_navigator(worst_timeframe, main_plot)
+        if navigator is not None:
+            plot_layout.addItem(navigator, widget_num+1, 0)
+            self._sync_main_plot_with_navigator(main_plot, ROI_region)
+            main_plot.sigXRangeChanged.connect(lambda _, plot=main_plot, region=ROI_region: self._sync_navigator_with_main(main_plot=plot, region=region))
             
         result_layout.addWidget(plot_layout)
         return result_widget, reg_items, curve_items
diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc
index 37ad3b95907af2bbb47674873123bba7f43a9998..54561f9b269bec129c89501b7121f0c8574bd50c 100644
GIT binary patch
delta 640
zcmZ`$&1(~J5dFQ)?i!OW*hY!iv`Jc9x-F)a#Hs<M>(bDCxEH|>5Q>soVi9HQK|;hs
z4~n9P&Z*Etqxc8tUfN(Uo_gq^B6tuH`VV*#FBWxX3%$9A$D5h=-Z1-XucEUG>%L{h
z6o1Q|+w+g!SugWtovVmaSj;easFu_k+6t<r*0eh6Xlu;TQnQh|x}t2&Yh+k$>;5U0
z`~3`GO@D5&(VV00{Ae`FjhNO2+RNX?bDA&I%smnQrtV_GIL7o<@TqXkz%tpz_c#=M
zE9yEr!R|!|_z?_Fxk&0@!wO67s2>ylOcD%w>`WYqOZ`FWsIbGd=}h8R@YA`09`V_x
z|3{{O1rjvtrVyu=n>D*d-a~KPaTvj8_a4wo&h$B?s5!k6AJcd`!k*?ZWvj>OYUvho
z!Fp)}0QocHI8U!<9u$ToB*`*c^Uufz{yEAY7C0+qN}x|*lzSH>bc{;nGzRESxq;KP
zQ+|O<bhEO65^YsHR47?pfJaN!+>;1f_~I?GhvDI^T@oH1yeWf%fF(-P|L^>$%r(zr
zO|RHf0^h|sbdb>(YWDNe!bkLdNmj(+nkg3ZLk~z}@SuB=uGezu@LdwpJR#68kP)cL
Vh8(@EO<<kA)IP$XmCH{t`48K|hYA1y

delta 600
zcmYL_&r1|>7{<TP>^R!mgs#b!yY9A`hh5lp!Lc@xa2-}0_s69}D1;C}q=@y+gM?7v
zK|?&qi$$;p{S$N!vL+rpdF|3s5Kl$X$%|6-z9ZNiKJ&cK`@HY)&R!i`b=Y&Z9aj7l
zcAveN+_u;HY4e7e3n_&+H`$(7OKKBa3ThFHYRY)79xEN?MmnUk{L%>qo%Uxei$&O=
zPG=e)=)F@(TuA#|5WhmVs7}V3|HFCGgmoGj+=1nv4Voqz{`sRK@XH?>b`cGMqn|mN
zZqe67ugI)PAB*|6u+;lfH;ZbaZ^ipK^X-udL}V^)=|9r_D~Qm78%LNn+?3TO@pjsG
z`(XM%-C3ZECQAjxh)NA)s5-iYtp9bi0VrA>>qCLQjJ<O1$yji;p$B9qx0UV{JdiRt
zFt{zv-jKmohNiqEQuNMyi9CJxR$Gf=Kjiq^7;Tqs(Wh|_B{~_e!J~Y6234w;b5VmA
z@Wn^6HuzL<Yb%|UJM8Pyv-E%GX@@vQt;TK_OC1v&%WSW}5yXScrA~-8FB5kp8zhD~
s#%@ZCyH{=xy{_bv!LN^qd0WseND9ibJ4*+ZJa*}K<q#(ARF^UE4}o8RTmS$7

diff --git a/src/utils/base/base.py b/src/utils/base/base.py
index b48e234..0860912 100644
--- a/src/utils/base/base.py
+++ b/src/utils/base/base.py
@@ -387,6 +387,7 @@ class BaseMainWindow(QWidget):
     def __init__(self, 
                  controller: Optional[BaseController] = None):
         super().__init__()
+        self.resize(800,800)
         self._controller = controller
         ...