Compare commits

...

2 Commits

7 changed files with 21 additions and 11 deletions

View File

@ -84,7 +84,7 @@ class MainWindow(BaseMainWindow):
self.system_dock.hide() # Скрываем по умолчанию self.system_dock.hide() # Скрываем по умолчанию
# Создаем док-виджет для ReportSettings # Создаем док-виджет для 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.setWidget(self.repSettings)
self.report_dock.setObjectName("ReportSettings") self.report_dock.setObjectName("ReportSettings")
self.addDockWidget(Qt.RightDockWidgetArea, self.report_dock) self.addDockWidget(Qt.RightDockWidgetArea, self.report_dock)
@ -160,11 +160,11 @@ class MainWindow(BaseMainWindow):
self.progress_bar.setSizePolicy(QSP.Policy.Fixed, QSP.Policy.Preferred) 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.addWidget(self.note_label)
note_layout.addStretch(1) note_layout.addStretch(1)
note_layout.addWidget(self.progress_bar) note_layout.addWidget(self.mode_label)
# Установка политики размеров для note_widget # Установка политики размеров для note_widget
note_widget.setSizePolicy(QSP.Policy.Expanding, QSP.Policy.Preferred) note_widget.setSizePolicy(QSP.Policy.Expanding, QSP.Policy.Preferred)
@ -277,21 +277,25 @@ class MainWindow(BaseMainWindow):
self.note_label.adjustSize() self.note_label.adjustSize()
def _transfer_settings(self) -> None: def _transfer_settings(self) -> None:
self.tabWidget.clear()
operator_params = self.operSettings.getParams() operator_params = self.operSettings.getParams()
system_params = self.sysSettings.getParams() system_params = self.sysSettings.getParams()
self._controller.update_settings([operator_params, system_params]) self._controller.update_settings([operator_params, system_params])
def _upd_settings(self) -> None: def _upd_settings(self) -> None:
self._transfer_settings() self._transfer_settings()
self._controller.update_plots() if self.mode_label.text():
self.tabWidget.clear()
self._controller.update_plots()
def _close_tab(self, index:int) -> None: def _close_tab(self, index:int) -> None:
self.tabWidget.removeTab(index) self.tabWidget.removeTab(index)
def _open_file(self) -> None: def _open_file(self) -> None:
path = self._select_csv() 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]: def _select_csv(self) -> Optional[str]:
CSV_path, _ = QtWidgets.QFileDialog.getOpenFileName(self,"Select csv file", "", "CSV Files (*.csv)") CSV_path, _ = QtWidgets.QFileDialog.getOpenFileName(self,"Select csv file", "", "CSV Files (*.csv)")
@ -301,7 +305,10 @@ class MainWindow(BaseMainWindow):
return None return None
def _on_tab_changed(self, index): 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(): if tab is not None and self.report_dock.isVisible():
reg_items = tab.property("reg_items") reg_items = tab.property("reg_items")
curve_items = tab.property("curve_items") curve_items = tab.property("curve_items")

View File

@ -183,7 +183,7 @@ class settingsWindow(QWidget):
class SystemSettings(settingsWindow): class SystemSettings(settingsWindow):
def __init__(self, path, name, upd_func): def __init__(self, path, name, upd_func):
assosiated_names = { assosiated_names = {
"trace_storage_path": "trace path", "trace_storage_path": "Trace path",
"monitor_update_period": "Monitoring period", "monitor_update_period": "Monitoring period",
"a_max_1": "Max lin accel FE, m/s^2", "a_max_1": "Max lin accel FE, m/s^2",
"v_max_1": "Max lin speed FE, m/s", "v_max_1": "Max lin speed FE, m/s",

View File

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