bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 11:41:49 +02:00
Code Activity

refactor(device_line_edit): renamed default_device to default

Browse Source
This commit is contained in:
wyzula_j
2024-06-19 00:04:20 +02:00
parent 8b822e0fa8
commit 4e2c9df6a4
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py
View File

@ -18,7 +18,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
config: Device input configuration. config: Device input configuration.
gui_id: GUI ID. gui_id: GUI ID.
device_filter: Device filter, name of the device class. 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. 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, config: DeviceInputConfig = None,
gui_id: str | None = None, gui_id: str | None = None,
device_filter: str | None = None, device_filter: str | None = None,
default_device: str | None = None, default: str | None = None,
arg_name: str | None = None, arg_name: str | None = None,
): ):
super().__init__(client=client, config=config, gui_id=gui_id) super().__init__(client=client, config=config, gui_id=gui_id)
@ -41,8 +41,8 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
self.config.arg_name = arg_name self.config.arg_name = arg_name
if device_filter is not None: if device_filter is not None:
self.set_device_filter(device_filter) self.set_device_filter(device_filter)
if default_device is not None: if default is not None:
self.set_default_device(default_device) self.set_default_device(default)
def set_device_filter(self, device_filter: str): def set_device_filter(self, device_filter: str):
""" """

4
bec_widgets/widgets/device_inputs/device_input_base.py
View File

@ -5,7 +5,7 @@ from bec_widgets.utils import BECConnector, ConnectionConfig
class DeviceInputConfig(ConnectionConfig): class DeviceInputConfig(ConnectionConfig):
device_filter: str | list[str] | None = None device_filter: str | list[str] | None = None
default_device: str | None = None default: str | None = None
arg_name: str | None = None arg_name: str | None = None
@ -65,7 +65,7 @@ class DeviceInputBase(BECConnector):
default_device(str): Default device name. default_device(str): Default device name.
""" """
self.validate_device(default_device) 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]: def get_device_list(self, filter: str | list[str] | None = None) -> list[str]:
""" """

9
bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py
View File

@ -18,7 +18,7 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
config: Device input configuration. config: Device input configuration.
gui_id: GUI ID. gui_id: GUI ID.
device_filter: Device filter, name of the device class. 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. 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, config: DeviceInputConfig = None,
gui_id: str | None = None, gui_id: str | None = None,
device_filter: str | list[str] | None = None, device_filter: str | list[str] | None = None,
default_device: str | None = None, default: str | None = None,
arg_name: str | None = None, arg_name: str | None = None,
): ):
QLineEdit.__init__(self, parent=parent) QLineEdit.__init__(self, parent=parent)
@ -41,10 +41,11 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
if arg_name is not None: if arg_name is not None:
self.config.arg_name = arg_name self.config.arg_name = arg_name
self.arg_name = arg_name
if device_filter is not None: if device_filter is not None:
self.set_device_filter(device_filter) self.set_device_filter(device_filter)
if default_device is not None: if default is not None:
self.set_default_device(default_device) self.set_default_device(default)
def set_device_filter(self, device_filter: str | list[str]): def set_device_filter(self, device_filter: str | list[str]):
""" """

8
tests/unit_tests/test_device_input_base.py
View File

@ -17,7 +17,7 @@ def test_device_input_base_init(device_input_base):
assert isinstance(device_input_base, DeviceInputBase) assert isinstance(device_input_base, DeviceInputBase)
assert device_input_base.config.widget_class == "DeviceInputBase" assert device_input_base.config.widget_class == "DeviceInputBase"
assert device_input_base.config.device_filter is None 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 == [] assert device_input_base.devices == []
@ -26,12 +26,12 @@ def test_device_input_base_init_with_config(mocked_client):
"widget_class": "DeviceInputBase", "widget_class": "DeviceInputBase",
"gui_id": "test_gui_id", "gui_id": "test_gui_id",
"device_filter": "FakePositioner", "device_filter": "FakePositioner",
"default_device": "samx", "default": "samx",
} }
widget = DeviceInputBase(client=mocked_client, config=config) widget = DeviceInputBase(client=mocked_client, config=config)
assert widget.config.gui_id == "test_gui_id" assert widget.config.gui_id == "test_gui_id"
assert widget.config.device_filter == "FakePositioner" 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): 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): def test_device_input_base_set_default_device(device_input_base):
device_input_base.set_default_device("samx") 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): def test_device_input_base_set_default_device_error(device_input_base):

20
tests/unit_tests/test_device_input_widgets.py
View File

@ -21,7 +21,7 @@ def device_input_combobox_with_config(qtbot, mocked_client):
"widget_class": "DeviceComboBox", "widget_class": "DeviceComboBox",
"gui_id": "test_gui_id", "gui_id": "test_gui_id",
"device_filter": "FakePositioner", "device_filter": "FakePositioner",
"default_device": "samx", "default": "samx",
"arg_name": "test_arg_name", "arg_name": "test_arg_name",
} }
widget = DeviceComboBox(client=mocked_client, config=config) widget = DeviceComboBox(client=mocked_client, config=config)
@ -37,7 +37,7 @@ def device_input_combobox_with_kwargs(qtbot, mocked_client):
client=mocked_client, client=mocked_client,
gui_id="test_gui_id", gui_id="test_gui_id",
device_filter="FakePositioner", device_filter="FakePositioner",
default_device="samx", default="samx",
arg_name="test_arg_name", arg_name="test_arg_name",
) )
qtbot.addWidget(widget) qtbot.addWidget(widget)
@ -52,7 +52,7 @@ def test_device_input_combobox_init(device_input_combobox):
assert isinstance(device_input_combobox, DeviceComboBox) assert isinstance(device_input_combobox, DeviceComboBox)
assert device_input_combobox.config.widget_class == "DeviceComboBox" assert device_input_combobox.config.widget_class == "DeviceComboBox"
assert device_input_combobox.config.device_filter is None 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 == [ assert device_input_combobox.devices == [
"samx", "samx",
"samy", "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): 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.gui_id == "test_gui_id"
assert device_input_combobox_with_config.config.device_filter == "FakePositioner" 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" 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): 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.gui_id == "test_gui_id"
assert device_input_combobox_with_kwargs.config.device_filter == "FakePositioner" 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" 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", "widget_class": "DeviceLineEdit",
"gui_id": "test_gui_id", "gui_id": "test_gui_id",
"device_filter": "FakePositioner", "device_filter": "FakePositioner",
"default_device": "samx", "default": "samx",
"arg_name": "test_arg_name", "arg_name": "test_arg_name",
} }
widget = DeviceLineEdit(client=mocked_client, config=config) widget = DeviceLineEdit(client=mocked_client, config=config)
@ -122,7 +122,7 @@ def device_input_line_edit_with_kwargs(qtbot, mocked_client):
client=mocked_client, client=mocked_client,
gui_id="test_gui_id", gui_id="test_gui_id",
device_filter="FakePositioner", device_filter="FakePositioner",
default_device="samx", default="samx",
arg_name="test_arg_name", arg_name="test_arg_name",
) )
qtbot.addWidget(widget) 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 isinstance(device_input_line_edit, DeviceLineEdit)
assert device_input_line_edit.config.widget_class == "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.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 == [ assert device_input_line_edit.devices == [
"samx", "samx",
"samy", "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): 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.gui_id == "test_gui_id"
assert device_input_line_edit_with_config.config.device_filter == "FakePositioner" 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" 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): 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.gui_id == "test_gui_id"
assert device_input_line_edit_with_kwargs.config.device_filter == "FakePositioner" 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" assert device_input_line_edit_with_kwargs.config.arg_name == "test_arg_name"