diff --git a/params/filter_params.json b/params/filter_params.json new file mode 100644 index 0000000..ad09f44 --- /dev/null +++ b/params/filter_params.json @@ -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] +} diff --git a/src/gui/main_gui.py b/src/gui/main_gui.py index 1a05e3f..8e3ba04 100644 --- a/src/gui/main_gui.py +++ b/src/gui/main_gui.py @@ -6,7 +6,7 @@ from gui.start_widget import (CustomMenuBar, CustomStatusBar, StartWidget, CustomTabWidget, RaportWidget, SeekingWidget, ClientAnalyzerWidget) -from gui.settings_window import SystemSettings, OperatorSettings +from gui.settings_window import SystemSettings, OperatorSettings, FilterSettings 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.repSettings = ReportSettings() 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: self.menu = CustomMenuBar(self.sysSettings, self.repSettings, self.operSettings) @@ -134,7 +135,10 @@ class MainWindow(BaseMainWindow): self.signal_mode.emit(3) 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) def _upd_settings(self) -> None: diff --git a/src/gui/settings_window.py b/src/gui/settings_window.py index 214354c..597ded3 100644 --- a/src/gui/settings_window.py +++ b/src/gui/settings_window.py @@ -238,6 +238,24 @@ class OperatorSettings(settingsWindow): 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): def __init__(self, data_type='str', parent=None): super().__init__(parent)