diff --git a/src/controller/__pycache__/monitor.cpython-310.pyc b/src/controller/__pycache__/monitor.cpython-310.pyc index 7aac475..84d1e9c 100644 Binary files a/src/controller/__pycache__/monitor.cpython-310.pyc and b/src/controller/__pycache__/monitor.cpython-310.pyc differ diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index a158557..4e1ce22 100644 Binary files a/src/controller/__pycache__/passportFormer.cpython-310.pyc and b/src/controller/__pycache__/passportFormer.cpython-310.pyc differ diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index 4fc53b1..b6a102a 100644 Binary files a/src/gui/__pycache__/mainGui.cpython-310.pyc and b/src/gui/__pycache__/mainGui.cpython-310.pyc differ diff --git a/src/gui/__pycache__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc index dea8ff3..2621f25 100644 Binary files a/src/gui/__pycache__/settings_window.cpython-310.pyc and b/src/gui/__pycache__/settings_window.cpython-310.pyc differ 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)