diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index 5cca7ce..c6bb37f 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 ee28745..cc752df 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 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 245a51b..78459fc 100644 Binary files a/src/utils/__pycache__/qt_settings.cpython-310.pyc and b/src/utils/__pycache__/qt_settings.cpython-310.pyc differ 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; /* Линии сетки */