From fdec6e8f6e623891cc43eae6587a7d45e34e9210 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 24 Dec 2024 16:56:04 +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=BE=D0=BA=D0=BD=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/monitor.cpython-310.pyc | Bin 3069 -> 2966 bytes .../passportFormer.cpython-310.pyc | Bin 4675 -> 4603 bytes src/gui/__pycache__/mainGui.cpython-310.pyc | Bin 9092 -> 9249 bytes .../settings_window.cpython-310.pyc | Bin 7053 -> 7053 bytes src/gui/mainGui.py | 2 ++ src/gui/settings_window.py | 2 +- 6 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controller/__pycache__/monitor.cpython-310.pyc b/src/controller/__pycache__/monitor.cpython-310.pyc index 7aac4751912d1a8e0d136163b13184bda7a2cae0..84d1e9ca42be47578f29836fef4d6bdea387339f 100644 GIT binary patch delta 259 zcmew>K24l2pO=@50SI)rWuNX@S|v}Ll*4#=6#s2 m6K*t9GmI+u^Y$5rm6b~&&h?iIy>!(#Z#y;aHkdl8Kl}iGfmFKy diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index a158557f114b4ded83c4c3be8971d68399338be6..4e1ce225a01e35d8b0506499394aaae8f1cbf270 100644 GIT binary patch delta 250 zcmX@C@>`iVpO=@50SK(NWu?n+Dz>Ylug+cua#g`PJ;I82Vn#o@ykj}D@k&&S=u!gaQ zwT2^&Iha9Hbh91LGDbd4rXp6LTW_%yBo-y+PEO>No@~Vz!5A`mGG8bo&*YbU$%}*e o85!LshY0Ah@-Xr-aZTmrjK^;b&$@>Ib0nWfc#sB~S delta 324 zcmXAkKTpC?6vf{y6x-MK^`ZEOt%)uSc5*SnL2+_3L?#Ct9`YxlU@0b&+hBr@Om8&? zqG4h&41NH=g{y;p2Nxf5hBKV|yC*rnyB~W_$8ji8`gv*9@86sug}EHl84Trtb$EP- zq-CI$Cy5=Kf{g%3$W=yT3#o9&T4JNUVv0l&d`X}tNFSniOh-~aTSw)rFdhulCaEbo zB_l}OFfG4KF>~1zcyV?9SZGN<^>A@B+_8>?ph(fJYn_>=@2$jIZ%3g}uNDwFL zL8u-?@xwz&!O2lPsO+`9coMvO(t>!g^q?RJ6%;2+a1P(hJKw|m&U_Ef_ZRIA+m17} zD!bnLm$x|&mE|c zh$%u7+J8bD66qn4>9cM`L}Zr7Lx+gW2@FrQoY02Yh{ANC%e;t$P3Dbu4HYoP6Dq(I zrY!Je*fG4EFxy41#O=rGnZi(p`k=#EjZHhGn@iEUak<&xx2b9#qD&W}3uE<|-)^*T z`DYugdcwc4(Ye(0{l79V;3@i; zoHJY%lcv0V2%lW%6*{!zbYgduMQd3VI&cale=zQcOfs(iT4OJ@r78;RjHa?!B!x%_W>D9 zj-1x;Cb&8}ui*o26}C~OQ^hrWrsu`?_)2S~AK0gAxrgs`P=1D=boa5#hqM(4*ouz|oHBRf)DEysUOs`n-OX z{9w=2!Y&NoIf~7*F-ckH87b!qd8$UHg1yKTV&nE%7cQcKjO}qerK7|mTpCZF(13>euiZ>6b;g+c7{=^GvWJ-7!G&7^HB9p7& zBhBTu#15aWfttDJ_#9NaHi0j}LH84mZ^316h2xMO=eMyy$N4ILQMu5-Z@Mm=;gp&W yw$P&Y1D|kCg~4rH(C*-0T#{eh$4h!OG{bLMuro9PI6-T;3^5Wf_KeYJ>E=Ho{f6`a diff --git a/src/gui/__pycache__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc index dea8ff329d95a36ae9a1e7e25151d69682687379..2621f252dd0343fb2c045c67d6438a12a5ac9122 100644 GIT binary patch delta 30 kcmeA*?=|Pm=jG*M0D|4Sv(jBQ^12H#r7&#{6Ef!n0C$E5jsO4v delta 30 kcmeA*?=|Pm=jG*M0D{L`veNxG^12H#)i7@k6Ef!n0DAie(*OVf diff --git a/src/gui/mainGui.py b/src/gui/mainGui.py index b2776db..528f53b 100644 --- a/src/gui/mainGui.py +++ b/src/gui/mainGui.py @@ -30,6 +30,7 @@ class MainWindow(BaseMainWindow): self.operSettings = OperatorSettings("params/operator_params.json", 'Operator', self._upd_settings) self.sysSettings = SystemSettings("params/system_params.json", 'System', self._upd_settings) self.repSettings = ReportSettings() + self.statusBar().showMessage("Ready") self._clear() self.resize(800,800) @@ -120,6 +121,7 @@ class MainWindow(BaseMainWindow): view_settings = QtWidgets.QAction("View settings", self) view_settings.setIcon(QIcon('resources/view_ico.png')) view_settings.triggered.connect(lambda: self._toggle_visibility(self.report_dock)) + view_settings.triggered.connect(lambda: self._on_tab_changed(0)) # Добавляем действия в меню "Режимы" diff --git a/src/gui/settings_window.py b/src/gui/settings_window.py index d98f64c..30040f9 100644 --- a/src/gui/settings_window.py +++ b/src/gui/settings_window.py @@ -158,7 +158,7 @@ class settingsWindow(QWidget): prev_columns = self._param_table.columnCount() desired_columns = num_points - if desired_columns <= prev_columns: + if desired_columns <= 0: return self._param_table.setColumnCount(desired_columns)