From 38209774c8551e23997d5425ec0e52c2106dd4e3 Mon Sep 17 00:00:00 2001
From: Andrew <nazarov_a@diakont.ru>
Date: Thu, 26 Dec 2024 11:39:38 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gui/__pycache__/mainGui.cpython-310.pyc   | Bin 10517 -> 10545 bytes
 .../settings_window.cpython-310.pyc           | Bin 9310 -> 9310 bytes
 src/gui/mainGui.py                            |  16 ++++++++++------
 src/gui/settings_window.py                    |   2 +-
 .../__pycache__/qt_settings.cpython-310.pyc   | Bin 10594 -> 10687 bytes
 src/utils/qt_settings.py                      |   7 +++++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc
index 5cca7ce82c7447a64f1f64000c042f7244135cc8..c6bb37f64f65fe6f69ff573639e6b5f25e8df4c9 100644
GIT binary patch
delta 808
zcmZXS-%C?r7{}k|OpnvC9}SQDq0UX`=E6c92Hu3N5K{ad$@;-EHf&O}y_*i!%mORJ
zO6AGA^hjZJ5oWvTx_=<38(DM{UG*nOP|tHB5;_My=lg!2@A>kcm$NysH({HzTI&Q|
zU$h%DYVV%SV=*6C&!<xbf3DnZIbp(eyBn8mE6!mG$s>e_B1c%C#tpmMIZCp~%Q40&
z0uI}I{!b5b+REwMf72MSdGMn>3ZrF{qg#Pm>~#h}El)Y$Dv&|5)&e8gp?!uJ{?yKq
zGv3e#L%7<Y!+5#V6$eO^@4MdtEMT8^R84Siq5Q=A4Iqx$CJ9;m-gLBek^Bpmo7d;^
zi9$L#lgi5+Cyi|^vATm@&HFHpwZ3M5mW>AtKOs^j-Sns^(_M0v%||%k`=qV2^e`G3
zO$@|iEz)y|B%RMyc9MTI7s#jhzU6t(6_y1;rEWSoJD<x>ri&?x8<A%`H2VIPuHaq&
zSNgm};GVj`^923~e1I){(>mD}B%>sBu`L#%1W7Ru(oqt#perTV1`tUxiLSN*?H1+2
zAVkhg!VG3`K-DkIwCz{xWOU+C@J!DvsbUSiEp(thWlCgJ5PT<T6&EGN=<lY4qMNpb
zjN)#v-*Wg24}xBGkZR-{dfNlq7R!f>!=bTumm|u1si%noHc&yuZ2JzpKzAq%FR?%5
zg;#hnbX?sr3UDpdSk3>}N!$&sSz>G&f8P+E4f|q`dA-3vLdBHM<mINJa(O9Ncwn4c
qgq5Gcry+GlfKkNP;dFhqxyEUcHZn#cE~)Tf8ABbH;TkS?Z2Sg=yt!%s

delta 802
zcmZXS%TE(g6vpQaFxED0p;G#wrBi52i@^sFjjV*I5tNp+YVbwVw3DVyrOllw#HL81
zQHYPA9Em$@HIf)zi2V;Vu3VVtrjp3QzrdXvO}uA}35m1#^1J7L-@WIa%vO9oZYi40
zMuC5y%!TaBku8hMWUN@@N~y>+Ing+1I?@8CamVVwMazoqEH|<aE)kJU5s&jNrzgs>
zLdzI|`9e-vkX1#~a&uV~$E-vD=O!p;rreExIrLdv_})4U(Z)~fVG$&Z*!-}!amMyW
zglqV#(+5-Nv44Rv{9!-GD<`{-!6Ytq)nK|IJ1zpuHY(1y0A(C>$D~<0cfN7c{T*Ni
z6%T_FHa!EqRbIbjDiw-aav_(=DjH+tTqMzZS;By~3Dfx7>y=7Wy@PU3r*xO_9**{W
zwyzSpNV-WpBx~sRG1p~|d^9Plr2n#$81c35Nl%h+p3Al|mC2V?Es?7z+^$>JF(vPV
zWh~3z_zM#L+fteAv$*4b2OC)LO*qI`6>36VScIyOhniT0IsiKQPIb`u`#})YRt^Se
z2V{NCwx@itA7g<N@{FF%3pL<ru_|VSGO#c|MXa^d1vY>m0>@3ehtM8$OA|cA=I~I^
zZ{HwXA=z!>EnED&I7ByFI2iFka1);4NT?s4<CTybHgO?zKzgCa@l~k1?K;O%{1{qY
z8l$5A8%+`ok_?dybJ=b!<W!9vrS*N1ha_vX(~_Ih*khfzgDumBKCB3lOrrmd^m<0^
wF}icxoJ^(*DOF7?g+emPy76oO`Oa3u9-Dzt>(PjViDbTo<Ke52#aj5$A9iNLwEzGB

diff --git a/src/gui/__pycache__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc
index ee28745f9d379592021063e16734021455addb76..cc752df940846d8846a2f1ccc20357e4cab1a7a1 100644
GIT binary patch
delta 27
hcmccTanFN0pO=@50SFe0<Zk577H16ETrU2c2LNrP2i5=p

delta 27
hcmccTanFN0pO=@50SK-f&f3VGEzVf7xm^4?4*+@52-5%n

diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py
index 378af10..48b294e 100644
--- a/src/gui/mainGui.py
+++ b/src/gui/mainGui.py
@@ -84,7 +84,7 @@ class MainWindow(BaseMainWindow):
         self.system_dock.hide()  # Скрываем по умолчанию
 
         # Создаем док-виджет для ReportSettings
-        self.report_dock = QtWidgets.QDockWidget("Report Settings", self)
+        self.report_dock = QtWidgets.QDockWidget("View settings", self)
         self.report_dock.setWidget(self.repSettings)
         self.report_dock.setObjectName("ReportSettings")
         self.addDockWidget(Qt.RightDockWidgetArea, self.report_dock)
@@ -160,11 +160,11 @@ class MainWindow(BaseMainWindow):
         self.progress_bar.setSizePolicy(QSP.Policy.Fixed, QSP.Policy.Preferred)
         
         # Добавление виджетов в макет
-        note_layout.addWidget(self.mode_label)
+        note_layout.addWidget(self.progress_bar)
         note_layout.addWidget(self.note_label)
         note_layout.addStretch(1)
-        note_layout.addWidget(self.progress_bar)
-        
+        note_layout.addWidget(self.mode_label)
+       
         # Установка политики размеров для note_widget
         note_widget.setSizePolicy(QSP.Policy.Expanding, QSP.Policy.Preferred)
         
@@ -294,7 +294,8 @@ class MainWindow(BaseMainWindow):
 
     def _open_file(self) -> None:
         path = self._select_csv()
-        self._controller.open_file(path)
+        if path is not None:
+            self._controller.open_file(path)
     
     def _select_csv(self) -> Optional[str]:
         CSV_path, _ = QtWidgets.QFileDialog.getOpenFileName(self,"Select csv file", "", "CSV Files (*.csv)")
@@ -304,7 +305,10 @@ class MainWindow(BaseMainWindow):
         return None
 
     def _on_tab_changed(self, index):
-        tab = self.tabWidget.currentWidget()
+        try: 
+            tab = self.tabWidget.currentWidget() 
+        except: 
+            tab = None
         if tab is not None and self.report_dock.isVisible():
             reg_items = tab.property("reg_items")
             curve_items = tab.property("curve_items")
diff --git a/src/gui/settings_window.py b/src/gui/settings_window.py
index 3e97925..f068e91 100644
--- a/src/gui/settings_window.py
+++ b/src/gui/settings_window.py
@@ -183,7 +183,7 @@ class settingsWindow(QWidget):
 class SystemSettings(settingsWindow):
     def __init__(self, path, name, upd_func):
         assosiated_names = {
-            "trace_storage_path": "trace path",
+            "trace_storage_path": "Trace path",
             "monitor_update_period": "Monitoring period",
             "a_max_1": "Max lin accel FE, m/s^2",
             "v_max_1": "Max lin speed FE, m/s",
diff --git a/src/utils/__pycache__/qt_settings.cpython-310.pyc b/src/utils/__pycache__/qt_settings.cpython-310.pyc
index 245a51be76d34c3a16b4925e0ffa38b6987ed08f..78459fc518cc3067cac21249ddbd6c7a41d33213 100644
GIT binary patch
delta 114
zcmaD9v_F_PpO=@50SM-Z<five<c(liuE4-B`8~Je##N`pSroMN6(-k7m`<J{!9STt
zl6P_ohrncaNwvw@N?e;?OZYPKIOiATr4~7rmXze@P3DtPo}ACe!C1T5P)dPcFp@=(
Qg$syzS@>C`IXHND0gm<^?*IS*

delta 82
zcmdlV{3wVwpO=@50SJCF=A`RS<c(nQQea@1{GQu!<Em5Q+*<ky%5H8h<^~2_lh;c~
kPM#zoz4@X<E92&=Qj+|FVJw0yTtLjr!p|bj!NJ1|0JYl_>i_@%

diff --git a/src/utils/qt_settings.py b/src/utils/qt_settings.py
index 661cc76..7bc6a0c 100644
--- a/src/utils/qt_settings.py
+++ b/src/utils/qt_settings.py
@@ -255,8 +255,8 @@ QDockWidget::title {
     color: #E0E0E0;
 }
 
-/* Кнопки закрытия и открепления (float) */ #FFD700
-QDockWidget::close-button, QDockWidget::float-button {
+/* Кнопки закрытия и открепления (float)  */ 
+QDockWidget::close-button, QDockWidget::float-button, QDockWidget::close-button:disabled {
     border: none;
     background-color: #FFCC00;
     icon-size: 18px;
@@ -273,6 +273,9 @@ QDockWidget::close-button:hover, QDockWidget::float-button:hover {
   Таблицы (QTableWidget / QTableView)
   ------------------------------------------------------
 */
+QTableCornerButton::section {
+    background-color: #1E1E1E;
+}
 QTableView {
     background-color: #1E1E1E;
     gridline-color: #424242;   /* Линии сетки */