dev: добавлен json настроек для фильтра событий клиентских трейсов

This commit is contained in:
Andrew 2025-02-05 18:50:50 +03:00
parent 3334dca2eb
commit 21fd64d7f7
3 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,9 @@
{
"robot_zero_velocity_trashold" : [0.008],
"actuator_zero_velocity_trashold" : [10],
"actuator_finishing_velocity" : [2050],
"actuator_finishing_velocity_trashold" : [200],
"actuator_current_trashold": [0.5],
"ROI_start": [0],
"ROI_finish": [100]
}

View File

@ -6,7 +6,7 @@ from gui.start_widget import (CustomMenuBar, CustomStatusBar,
StartWidget, CustomTabWidget, StartWidget, CustomTabWidget,
RaportWidget, SeekingWidget, RaportWidget, SeekingWidget,
ClientAnalyzerWidget) ClientAnalyzerWidget)
from gui.settings_window import SystemSettings, OperatorSettings from gui.settings_window import SystemSettings, OperatorSettings, FilterSettings
from gui.report_gui import ReportSettings from gui.report_gui import ReportSettings
@ -62,6 +62,7 @@ class MainWindow(BaseMainWindow):
self.sysSettings = SystemSettings("params/system_params.json", 'System', self._upd_settings) self.sysSettings = SystemSettings("params/system_params.json", 'System', self._upd_settings)
self.repSettings = ReportSettings() self.repSettings = ReportSettings()
self.operSettings = OperatorSettings("params/operator_params.json", 'Operator', self._upd_settings) self.operSettings = OperatorSettings("params/operator_params.json", 'Operator', self._upd_settings)
self.filterSettings = FilterSettings("params/filter_params.json", "Client filter", self._upd_settings)
def _init_menu(self) -> None: def _init_menu(self) -> None:
self.menu = CustomMenuBar(self.sysSettings, self.repSettings, self.operSettings) self.menu = CustomMenuBar(self.sysSettings, self.repSettings, self.operSettings)
@ -134,7 +135,10 @@ class MainWindow(BaseMainWindow):
self.signal_mode.emit(3) self.signal_mode.emit(3)
def _transfer_settings(self) -> None: def _transfer_settings(self) -> None:
settings = Settings(self.operSettings.getParams(), self.sysSettings.getParams()) settings = Settings()
settings.system = self.sysSettings.getParams()
settings.operator = self.operSettings.getParams()
settings.filter = self.filterSettings.getParams()
self.signal_settings.emit(settings) self.signal_settings.emit(settings)
def _upd_settings(self) -> None: def _upd_settings(self) -> None:

View File

@ -238,6 +238,24 @@ class OperatorSettings(settingsWindow):
pass pass
class FilterSettings(settingsWindow):
def __init__(self, path, name, upd_func):
assosiated_names = {
"robot_zero_velocity_trashold" : "Robot zero speed filter +-m/sec",
"actuator_zero_velocity_trashold" : "Actuator zero speed filter +-m/sec",
"actuator_finishing_velocity" : "Actuator finishing speed m/sec",
"actuator_finishing_velocity_trashold" : "Actuator finishing speed filter m/sec",
"actuator_current_trashold": "Actuator force filter N",
"ROI_start" : "Start time, sec",
"ROI_finish" : "End time, sec"
}
super().__init__(path, name, upd_func, assosiated_names)
self._num_points.setVisible(False)
def _expand(self):
pass
class ValidatorDelegate(QStyledItemDelegate): class ValidatorDelegate(QStyledItemDelegate):
def __init__(self, data_type='str', parent=None): def __init__(self, data_type='str', parent=None):
super().__init__(parent) super().__init__(parent)