From 4e2c9df6a4979d935285fd7eba17fd7fd455a35c Mon Sep 17 00:00:00 2001 From: wyzula-jan Date: Wed, 19 Jun 2024 00:04:20 +0200 Subject: [PATCH] refactor(device_line_edit): renamed default_device to default --- .../device_combobox/device_combobox.py | 8 ++++---- .../device_inputs/device_input_base.py | 4 ++-- .../device_line_edit/device_line_edit.py | 9 +++++---- tests/unit_tests/test_device_input_base.py | 8 ++++---- tests/unit_tests/test_device_input_widgets.py | 20 +++++++++---------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py index 0dbde00f..0145908a 100644 --- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py +++ b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py @@ -18,7 +18,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox): config: Device input configuration. gui_id: GUI ID. device_filter: Device filter, name of the device class. - default_device: Default device name. + default: Default device name. arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names. """ @@ -29,7 +29,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox): config: DeviceInputConfig = None, gui_id: str | None = None, device_filter: str | None = None, - default_device: str | None = None, + default: str | None = None, arg_name: str | None = None, ): super().__init__(client=client, config=config, gui_id=gui_id) @@ -41,8 +41,8 @@ class DeviceComboBox(DeviceInputBase, QComboBox): self.config.arg_name = arg_name if device_filter is not None: self.set_device_filter(device_filter) - if default_device is not None: - self.set_default_device(default_device) + if default is not None: + self.set_default_device(default) def set_device_filter(self, device_filter: str): """ diff --git a/bec_widgets/widgets/device_inputs/device_input_base.py b/bec_widgets/widgets/device_inputs/device_input_base.py index a3d6b883..7eef2aa2 100644 --- a/bec_widgets/widgets/device_inputs/device_input_base.py +++ b/bec_widgets/widgets/device_inputs/device_input_base.py @@ -5,7 +5,7 @@ from bec_widgets.utils import BECConnector, ConnectionConfig class DeviceInputConfig(ConnectionConfig): device_filter: str | list[str] | None = None - default_device: str | None = None + default: str | None = None arg_name: str | None = None @@ -65,7 +65,7 @@ class DeviceInputBase(BECConnector): default_device(str): Default device name. """ self.validate_device(default_device) - self.config.default_device = default_device + self.config.default = default_device def get_device_list(self, filter: str | list[str] | None = None) -> list[str]: """ diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py index a60afd88..02643bcc 100644 --- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py +++ b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py @@ -18,7 +18,7 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit): config: Device input configuration. gui_id: GUI ID. device_filter: Device filter, name of the device class. - default_device: Default device name. + default: Default device name. arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names. """ @@ -29,7 +29,7 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit): config: DeviceInputConfig = None, gui_id: str | None = None, device_filter: str | list[str] | None = None, - default_device: str | None = None, + default: str | None = None, arg_name: str | None = None, ): QLineEdit.__init__(self, parent=parent) @@ -41,10 +41,11 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit): if arg_name is not None: self.config.arg_name = arg_name + self.arg_name = arg_name if device_filter is not None: self.set_device_filter(device_filter) - if default_device is not None: - self.set_default_device(default_device) + if default is not None: + self.set_default_device(default) def set_device_filter(self, device_filter: str | list[str]): """ diff --git a/tests/unit_tests/test_device_input_base.py b/tests/unit_tests/test_device_input_base.py index e7599727..3c6ab5ec 100644 --- a/tests/unit_tests/test_device_input_base.py +++ b/tests/unit_tests/test_device_input_base.py @@ -17,7 +17,7 @@ def test_device_input_base_init(device_input_base): assert isinstance(device_input_base, DeviceInputBase) assert device_input_base.config.widget_class == "DeviceInputBase" assert device_input_base.config.device_filter is None - assert device_input_base.config.default_device is None + assert device_input_base.config.default is None assert device_input_base.devices == [] @@ -26,12 +26,12 @@ def test_device_input_base_init_with_config(mocked_client): "widget_class": "DeviceInputBase", "gui_id": "test_gui_id", "device_filter": "FakePositioner", - "default_device": "samx", + "default": "samx", } widget = DeviceInputBase(client=mocked_client, config=config) assert widget.config.gui_id == "test_gui_id" assert widget.config.device_filter == "FakePositioner" - assert widget.config.default_device == "samx" + assert widget.config.default == "samx" def test_device_input_base_set_device_filter(device_input_base): @@ -47,7 +47,7 @@ def test_device_input_base_set_device_filter_error(device_input_base): def test_device_input_base_set_default_device(device_input_base): device_input_base.set_default_device("samx") - assert device_input_base.config.default_device == "samx" + assert device_input_base.config.default == "samx" def test_device_input_base_set_default_device_error(device_input_base): diff --git a/tests/unit_tests/test_device_input_widgets.py b/tests/unit_tests/test_device_input_widgets.py index 95d7b76f..0e3e4b56 100644 --- a/tests/unit_tests/test_device_input_widgets.py +++ b/tests/unit_tests/test_device_input_widgets.py @@ -21,7 +21,7 @@ def device_input_combobox_with_config(qtbot, mocked_client): "widget_class": "DeviceComboBox", "gui_id": "test_gui_id", "device_filter": "FakePositioner", - "default_device": "samx", + "default": "samx", "arg_name": "test_arg_name", } widget = DeviceComboBox(client=mocked_client, config=config) @@ -37,7 +37,7 @@ def device_input_combobox_with_kwargs(qtbot, mocked_client): client=mocked_client, gui_id="test_gui_id", device_filter="FakePositioner", - default_device="samx", + default="samx", arg_name="test_arg_name", ) qtbot.addWidget(widget) @@ -52,7 +52,7 @@ def test_device_input_combobox_init(device_input_combobox): assert isinstance(device_input_combobox, DeviceComboBox) assert device_input_combobox.config.widget_class == "DeviceComboBox" assert device_input_combobox.config.device_filter is None - assert device_input_combobox.config.default_device is None + assert device_input_combobox.config.default is None assert device_input_combobox.devices == [ "samx", "samy", @@ -72,14 +72,14 @@ def test_device_input_combobox_init(device_input_combobox): def test_device_input_combobox_init_with_config(device_input_combobox_with_config): assert device_input_combobox_with_config.config.gui_id == "test_gui_id" assert device_input_combobox_with_config.config.device_filter == "FakePositioner" - assert device_input_combobox_with_config.config.default_device == "samx" + assert device_input_combobox_with_config.config.default == "samx" assert device_input_combobox_with_config.config.arg_name == "test_arg_name" def test_device_input_combobox_init_with_kwargs(device_input_combobox_with_kwargs): assert device_input_combobox_with_kwargs.config.gui_id == "test_gui_id" assert device_input_combobox_with_kwargs.config.device_filter == "FakePositioner" - assert device_input_combobox_with_kwargs.config.default_device == "samx" + assert device_input_combobox_with_kwargs.config.default == "samx" assert device_input_combobox_with_kwargs.config.arg_name == "test_arg_name" @@ -106,7 +106,7 @@ def device_input_line_edit_with_config(qtbot, mocked_client): "widget_class": "DeviceLineEdit", "gui_id": "test_gui_id", "device_filter": "FakePositioner", - "default_device": "samx", + "default": "samx", "arg_name": "test_arg_name", } widget = DeviceLineEdit(client=mocked_client, config=config) @@ -122,7 +122,7 @@ def device_input_line_edit_with_kwargs(qtbot, mocked_client): client=mocked_client, gui_id="test_gui_id", device_filter="FakePositioner", - default_device="samx", + default="samx", arg_name="test_arg_name", ) qtbot.addWidget(widget) @@ -137,7 +137,7 @@ def test_device_input_line_edit_init(device_input_line_edit): assert isinstance(device_input_line_edit, DeviceLineEdit) assert device_input_line_edit.config.widget_class == "DeviceLineEdit" assert device_input_line_edit.config.device_filter is None - assert device_input_line_edit.config.default_device is None + assert device_input_line_edit.config.default is None assert device_input_line_edit.devices == [ "samx", "samy", @@ -157,14 +157,14 @@ def test_device_input_line_edit_init(device_input_line_edit): def test_device_input_line_edit_init_with_config(device_input_line_edit_with_config): assert device_input_line_edit_with_config.config.gui_id == "test_gui_id" assert device_input_line_edit_with_config.config.device_filter == "FakePositioner" - assert device_input_line_edit_with_config.config.default_device == "samx" + assert device_input_line_edit_with_config.config.default == "samx" assert device_input_line_edit_with_config.config.arg_name == "test_arg_name" def test_device_input_line_edit_init_with_kwargs(device_input_line_edit_with_kwargs): assert device_input_line_edit_with_kwargs.config.gui_id == "test_gui_id" assert device_input_line_edit_with_kwargs.config.device_filter == "FakePositioner" - assert device_input_line_edit_with_kwargs.config.default_device == "samx" + assert device_input_line_edit_with_kwargs.config.default == "samx" assert device_input_line_edit_with_kwargs.config.arg_name == "test_arg_name"