From 0273bf485694609325b5b556a3c69fb53c18446e Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 8 Aug 2024 15:03:00 +0200 Subject: [PATCH] refactor: adjust dimensions --- bec_widgets/cli/client.py | 20 ++++----- .../positioner_box/positioner_control_line.py | 2 +- .../positioner_box/positioner_control_line.ui | 45 +++++++++++-------- tests/unit_tests/test_positioner_box.py | 4 +- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py index 1ea0ed7e..17a9712c 100644 --- a/bec_widgets/cli/client.py +++ b/bec_widgets/cli/client.py @@ -489,7 +489,7 @@ class BECFigure(RPCBase): col: "int | None" = None, dap: "str | None" = None, config: "dict | None" = None, - **axis_kwargs + **axis_kwargs, ) -> "BECWaveform": """ Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure. @@ -531,7 +531,7 @@ class BECFigure(RPCBase): row: "int | None" = None, col: "int | None" = None, config: "dict | None" = None, - **axis_kwargs + **axis_kwargs, ) -> "BECImageShow": """ Add an image to the figure. Always access the first image widget in the figure. @@ -561,7 +561,7 @@ class BECFigure(RPCBase): row: "int | None" = None, col: "int | None" = None, config: "dict | None" = None, - **axis_kwargs + **axis_kwargs, ) -> "BECMotorMap": """ Add a motor map to the figure. Always access the first motor map widget in the figure. @@ -832,7 +832,7 @@ class BECImageShow(RPCBase): downsample: "Optional[bool]" = True, opacity: "Optional[float]" = 1.0, vrange: "Optional[tuple[int, int]]" = None, - **kwargs + **kwargs, ) -> "BECImageItem": """ Add an image to the figure. Always access the first image widget in the figure. @@ -858,7 +858,7 @@ class BECImageShow(RPCBase): downsample: "Optional[bool]" = True, opacity: "Optional[float]" = 1.0, vrange: "Optional[tuple[int, int]]" = None, - **kwargs + **kwargs, ): """ None @@ -1147,7 +1147,7 @@ class BECImageWidget(RPCBase): downsample: "Optional[bool]" = True, opacity: "Optional[float]" = 1.0, vrange: "Optional[tuple[int, int]]" = None, - **kwargs + **kwargs, ) -> "BECImageItem": """ None @@ -1730,7 +1730,7 @@ class BECWaveform(RPCBase): label: "str | None" = None, validate: "bool" = True, dap: "str | None" = None, - **kwargs + **kwargs, ) -> "BECCurve": """ Plot a curve to the plot widget. @@ -1769,7 +1769,7 @@ class BECWaveform(RPCBase): color: "Optional[str]" = None, dap: "str" = "GaussianModel", validate_bec: "bool" = True, - **kwargs + **kwargs, ) -> "BECCurve": """ Add LMFIT dap model curve to the plot widget. @@ -2044,7 +2044,7 @@ class BECWaveformWidget(RPCBase): label: "str | None" = None, validate: "bool" = True, dap: "str | None" = None, - **kwargs + **kwargs, ) -> "BECCurve": """ Plot a curve to the plot widget. @@ -2078,7 +2078,7 @@ class BECWaveformWidget(RPCBase): color: "str | None" = None, dap: "str" = "GaussianModel", validate_bec: "bool" = True, - **kwargs + **kwargs, ) -> "BECCurve": """ Add LMFIT dap model curve to the plot widget. diff --git a/bec_widgets/widgets/positioner_box/positioner_control_line.py b/bec_widgets/widgets/positioner_box/positioner_control_line.py index 5e4a1802..f901b260 100644 --- a/bec_widgets/widgets/positioner_box/positioner_control_line.py +++ b/bec_widgets/widgets/positioner_box/positioner_control_line.py @@ -7,7 +7,7 @@ class PositionerControlLine(PositionerBox): """A widget that controls a single device.""" ui_file = "positioner_control_line.ui" - dimensions = (70, 800) # height, width + dimensions = (60, 600) # height, width def __init__(self, parent=None, device: Positioner = None, *args, **kwargs): """Initialize the DeviceControlLine. diff --git a/bec_widgets/widgets/positioner_box/positioner_control_line.ui b/bec_widgets/widgets/positioner_box/positioner_control_line.ui index fc1320d6..7f82771d 100644 --- a/bec_widgets/widgets/positioner_box/positioner_control_line.ui +++ b/bec_widgets/widgets/positioner_box/positioner_control_line.ui @@ -60,13 +60,36 @@ - + + + + 80 + 10 + + + + + + + + + 25 + 25 + + + + + 25 + 25 + + + - 150 + 80 0 @@ -88,7 +111,7 @@ - 150 + 80 24 @@ -171,22 +194,6 @@ - - - - - 25 - 25 - - - - - 25 - 25 - - - - diff --git a/tests/unit_tests/test_positioner_box.py b/tests/unit_tests/test_positioner_box.py index 1665f07e..46983232 100644 --- a/tests/unit_tests/test_positioner_box.py +++ b/tests/unit_tests/test_positioner_box.py @@ -126,5 +126,5 @@ def test_positioner_control_line(qtbot, mocked_client): db = PositionerControlLine(device="samx", client=mocked_client) qtbot.addWidget(db) - assert db.ui.device_box.height() == 70 - assert db.ui.device_box.width() == 800 + assert db.ui.device_box.height() == 60 + assert db.ui.device_box.width() == 600