bec-widgets 0.105.0__py3-none-any.whl → 0.106.0__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## v0.106.0 (2024-09-05)
+
+### Feature
+
+* feat(plot_base): toggle to switch outer axes for plotting widgets ([`06d7741`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06d7741622aea8556208cd17cae521c37333f8b6))
+
+### Refactor
+
+* refactor: use DAPComboBox in curve_dialog selection ([`998a745`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/998a7451335b1b35c3e18691d3bab8d882e2d30b))
+
+### Test
+
+* test: fix tests ([`6b15abc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b15abcc73170cb49292741a619a08ee615e6250))
+
 ## v0.105.0 (2024-09-04)
 
 ### Feature
@@ -143,15 +157,3 @@
 * fix(toolbar): widget action added ([`2efd487`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2efd48736cbe04e84533f7933c552ea8274e2162))
 
 * fix(reset_button): reset button added ([`6ed1efc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ed1efc6af193908f70aa37fb73157d2ca6a62f4))
-
-* fix(abort_button): abort button added; some minor fixes ([`a568633`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a568633c3206a8c26069d140f2d9a548bf4124b0))
-
-## v0.99.11 (2024-08-29)
-
-### Fix
-
-* fix(resume_button): resume button added ([`8be8295`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8be8295b2b38f36da210ab36c5da6d0a00e330cc))
-
-### Refactor
-
-* refactor(icons): general app icon changed; jupyter app icon changed to material icon ([`5d73fe4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d73fe455a568ad40a9fadc5ce6e249d782ad20d))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.105.0
+Version: 0.106.0
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

bec_widgets/cli/client.py

@@ -1653,6 +1653,15 @@ class BECPlotBase(RPCBase):
             y(bool): Show grid on the y-axis.
         """
 
+    @rpc_call
+    def set_outer_axes(self, show: "bool" = True):
+        """
+        Set the outer axes of the plot widget.
+
+        Args:
+            show(bool): Show the outer axes.
+        """
+
     @rpc_call
     def lock_aspect_ratio(self, lock):
         """
@@ -2317,7 +2326,7 @@ class DapComboBox(RPCBase):
     @rpc_call
     def select_y_axis(self, y_axis: str):
         """
-        Receive update signal for the y axis.
+        Slot to update the y axis.
 
         Args:
             y_axis(str): Y axis.
@@ -2326,19 +2335,19 @@ class DapComboBox(RPCBase):
     @rpc_call
     def select_x_axis(self, x_axis: str):
         """
-        Receive update signal for the x axis.
+        Slot to update the x axis.
 
         Args:
             x_axis(str): X axis.
         """
 
     @rpc_call
-    def select_fit(self, fit_name: str | None):
+    def select_fit_model(self, fit_name: str | None):
         """
-        Select current fit.
+        Slot to update the fit model.
 
-         Args:
-             default_device(str): Default device name.
+        Args:
+            default_device(str): Default device name.
         """
 
 

bec_widgets/widgets/figure/plots/axis_settings.py

@@ -31,6 +31,7 @@ class AxisSettings(SettingWidget):
 
         # Top Box
         WidgetIO.set_value(self.ui.plot_title, axis_config["title"])
+        self.ui.switch_outer_axes.checked = axis_config["outer_axes"]
 
         # X Axis Box
         WidgetIO.set_value(self.ui.x_label, axis_config["x_label"])
@@ -63,6 +64,7 @@ class AxisSettings(SettingWidget):
     @Slot()
     def accept_changes(self):
         title = WidgetIO.get_value(self.ui.plot_title)
+        outer_axes = self.ui.switch_outer_axes.checked
 
         # X Axis
         x_label = WidgetIO.get_value(self.ui.x_label)
@@ -86,3 +88,4 @@ class AxisSettings(SettingWidget):
             y_lim=y_lim,
         )
         self.target_widget.set_grid(x_grid, y_grid)
+        self.target_widget.set_outer_axes(outer_axes)

bec_widgets/widgets/figure/plots/axis_settings.ui

@@ -6,8 +6,8 @@
             <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>417</width>
-                <height>250</height>
+                <width>427</width>
+                <height>270</height>
             </rect>
         </property>
         <property name="minimumSize">
@@ -26,7 +26,28 @@
             <string>Form</string>
         </property>
         <layout class="QGridLayout" name="gridLayout">
-            <item row="1" column="1">
+            <item row="0" column="0" colspan="2">
+                <layout class="QHBoxLayout" name="horizontalLayout">
+                    <item>
+                        <widget class="QLabel" name="plot_title_label">
+                            <property name="text">
+                                <string>Plot Title</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item>
+                        <widget class="QLineEdit" name="plot_title"/>
+                    </item>
+                </layout>
+            </item>
+            <item row="1" column="0">
+                <widget class="QLabel" name="label_outer_axes">
+                    <property name="text">
+                        <string>Outer Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="2" column="1">
                 <widget class="QGroupBox" name="y_axis_box">
                     <property name="title">
                         <string>Y Axis</string>
@@ -120,7 +141,7 @@
                     </layout>
                 </widget>
             </item>
-            <item row="1" column="0">
+            <item row="2" column="0">
                 <widget class="QGroupBox" name="x_axis_box">
                     <property name="title">
                         <string>X Axis</string>
@@ -214,22 +235,22 @@
                     </layout>
                 </widget>
             </item>
-            <item row="0" column="0" colspan="2">
-                <layout class="QHBoxLayout" name="horizontalLayout">
-                    <item>
-                        <widget class="QLabel" name="plot_title_label">
-                            <property name="text">
-                                <string>Plot Title</string>
-                            </property>
-                        </widget>
-                    </item>
-                    <item>
-                        <widget class="QLineEdit" name="plot_title"/>
-                    </item>
-                </layout>
+            <item row="1" column="1">
+                <widget class="ToggleSwitch" name="switch_outer_axes">
+                    <property name="checked" stdset="0">
+                        <bool>false</bool>
+                    </property>
+                </widget>
             </item>
         </layout>
     </widget>
+    <customwidgets>
+        <customwidget>
+            <class>ToggleSwitch</class>
+            <extends>QWidget</extends>
+            <header>toggle_switch</header>
+        </customwidget>
+    </customwidgets>
     <resources/>
     <connections/>
 </ui>

bec_widgets/widgets/figure/plots/plot_base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections import defaultdict
 from typing import Literal, Optional
 
 import bec_qthemes
@@ -31,6 +32,7 @@ class AxisConfig(BaseModel):
     y_lim: Optional[tuple] = Field(None, description="The limits of the y-axis.")
     x_grid: bool = Field(False, description="Show grid on the x-axis.")
     y_grid: bool = Field(False, description="Show grid on the y-axis.")
+    outer_axes: bool = Field(False, description="Show the outer axes of the plot widget.")
     model_config: dict = {"validate_assignment": True}
 
 
@@ -75,6 +77,7 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         "set_x_lim",
         "set_y_lim",
         "set_grid",
+        "set_outer_axes",
         "lock_aspect_ratio",
         "export",
         "remove",
@@ -336,6 +339,17 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         self.config.axis.x_grid = x
         self.config.axis.y_grid = y
 
+    def set_outer_axes(self, show: bool = True):
+        """
+        Set the outer axes of the plot widget.
+
+        Args:
+            show(bool): Show the outer axes.
+        """
+        self.plot_item.showAxis("top", show)
+        self.plot_item.showAxis("right", show)
+        self.config.axis.outer_axes = show
+
     def add_legend(self):
         """Add legend to the plot"""
         self.plot_item.addLegend()

bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -13,6 +13,7 @@ from bec_widgets.qt_utils.error_popups import WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import Colors, UILoader
 from bec_widgets.widgets.color_button.color_button import ColorButton
+from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox
 from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
@@ -241,8 +242,9 @@ class DialogRow(QObject):
         self.device_line_edit = DeviceLineEdit()
         self.entry_line_edit = QLineEdit()
 
-        self.dap_combo = QComboBox()
-        self.populate_dap_combobox()
+        self.dap_combo = DapComboBox()
+        self.dap_combo.populate_fit_model_combobox()
+        self.dap_combo.select_fit_model("GaussianModel")
 
         # Styling
         self.color_button = ColorButton()
@@ -261,16 +263,6 @@ class DialogRow(QObject):
             lambda: self.remove_row()
         )  # From some reason do not work without lambda
 
-    def populate_dap_combobox(self):
-        available_models = [
-            attr
-            for attr in dir(self.client.dap)
-            if not attr.startswith("__")
-            and not callable(getattr(self.client.dap, attr))
-            and not attr.startswith("_")
-        ]
-        self.dap_combo.addItems(available_models)
-
     def add_scan_row(self):
         if self.config is not None:
             self.device_line_edit.setText(self.config.signals.y.name)
@@ -298,7 +290,7 @@ class DialogRow(QObject):
         if self.config is not None:
             self.device_line_edit.setText(self.config.signals.y.name)
             self.entry_line_edit.setText(self.config.signals.y.entry)
-            self.dap_combo.setCurrentText(self.config.signals.dap)
+            self.dap_combo.fit_model_combobox.setCurrentText(self.config.signals.dap)
             self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
@@ -312,7 +304,7 @@ class DialogRow(QObject):
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)
-        self.table_widget.setCellWidget(self.row, 2, self.dap_combo)
+        self.table_widget.setCellWidget(self.row, 2, self.dap_combo.fit_model_combobox)
         self.table_widget.setCellWidget(self.row, 3, self.color_button)
         self.table_widget.setCellWidget(self.row, 4, self.style_combo)
         self.table_widget.setCellWidget(self.row, 5, self.width)

bec_widgets/widgets/waveform/waveform_widget.py

@@ -560,6 +560,15 @@ class BECWaveformWidget(BECWidget, QWidget):
         """
         self.waveform.set_grid(x_grid, y_grid)
 
+    def set_outer_axes(self, show: bool):
+        """
+        Set the outer axes visibility of the plot widget.
+
+        Args:
+            show(bool): Visibility of the outer axes.
+        """
+        self.waveform.set_outer_axes(show)
+
     def lock_aspect_ratio(self, lock: bool):
         """
         Lock the aspect ratio of the plot widget.
@@ -633,10 +642,7 @@ class BECWaveformWidget(BECWidget, QWidget):
 def main():  # pragma: no cover
     from qtpy.QtWidgets import QApplication
 
-    from bec_widgets.utils.colors import set_theme
-
     app = QApplication(sys.argv)
-    set_theme("auto")
     widget = BECWaveformWidget()
     widget.show()
     sys.exit(app.exec_())

{bec_widgets-0.105.0.dist-info → bec_widgets-0.106.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.105.0
+Version: 0.106.0
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-0.105.0.dist-info → bec_widgets-0.106.0.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=Dc1iDjsc72UxdUtihx4uSZU0lrTQeR8hZwGx1MQBfKE,8432
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=g_RZX5HUBV0m39MX5Y8FO-GeBRnh2Wt2fob7OVvKlZY,7294
+CHANGELOG.md,sha256=VgvcwmknCXjX8mxzyJp2yygmsjtJtbaHfD8KQU5RpE0,7261
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=oeOXM8pekkxHvoDKlMGeTVyy__CKVPQW0zJqHpaimZs,1334
+PKG-INFO,sha256=ffhpXp786ojh7YAGYizUsBPGvONAJlGKSpSvSaTL804,1334
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=LYboSo9nhqhJ2QeWVBT_4QKioh4f-0AG8Hi1BfOhPTw,2544
+pyproject.toml,sha256=tFMA5VaEZprfuybgIv-mHOCvtaC1VMWruKRtKHyqI5M,2544
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -22,7 +22,7 @@ bec_widgets/assets/status_icons/running.svg,sha256=nlc6rKh_f-uOxQSk0BkBNyWnPAJU5
 bec_widgets/assets/status_icons/warning.svg,sha256=CNx88p9kbDG51s9ztKf-cfYan4JdDBbk3-IFKfOOFlI,364
 bec_widgets/cli/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 bec_widgets/cli/auto_updates.py,sha256=DwzRChcFIWPH2kCYvp8H7dXvyYSKGYv6LwCmK2sDR2E,5676
-bec_widgets/cli/client.py,sha256=_DAmHtAAZdRfRNzBztxb1tdx5uWjhZ0hFNntlufulUI,79062
+bec_widgets/cli/client.py,sha256=DCFTDwMNjLQwQe3mhg7eWoECYqaQJmvFvOrNhVZmmJ4,79251
 bec_widgets/cli/client_utils.py,sha256=EdDfo3uuYAWtZiDGGu3_GPnl94FSLkNG2N_4I9FNfMc,11809
 bec_widgets/cli/generate_cli.py,sha256=Ea5px9KblUlcGg-1JbJBTIU7laGg2n8PM7Efw9WVVzM,5889
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
@@ -146,9 +146,9 @@ bec_widgets/widgets/dock/register_dock_area.py,sha256=Yqd1mq6CcHwlxHZxX5EHKONy4P
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
 bec_widgets/widgets/figure/figure.py,sha256=IzQaV_9utjViJyjMydOa3-EJ9k-FVG2PTVm8_ENCbgY,28849
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/axis_settings.py,sha256=QxRpQwgfBr1H0HTjfOpiXi_-n8I0BaZhS8LRXNeVfFg,3544
-bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=a2qIuK9lyi9HCyrSvPr6wxzmm1FymaWcpmyOhMIiFt8,11013
-bec_widgets/widgets/figure/plots/plot_base.py,sha256=wuX0HQ_yY7gueXYOm1U1DIDLw8P5a6GW6WrJkYbPf_A,15210
+bec_widgets/widgets/figure/plots/axis_settings.py,sha256=grgrX4t4eAzccW4jj4HYtMSxy8Wgcd9N9J1aU7UHtIs,3723
+bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=ye-guaRU_jhu7sHZS-9AjBjLrCtA1msOD0dszu4o9x8,11785
+bec_widgets/widgets/figure/plots/plot_base.py,sha256=kciIDnTGi01R0wrXh7Jw_MUT1t4fy3wSUOj3x5DMMBY,15679
 bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/image/image.py,sha256=rq2zy-vwZLd3___rFRNEBnPFGKSu88T5T4ngrTkcbr0,25014
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=DhlBbI-c8nVbJ8tREQhyNr8Qk4W6PXF0HgBhrIoYQPo,11012
@@ -237,10 +237,10 @@ bec_widgets/widgets/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 bec_widgets/widgets/waveform/bec_waveform_widget.pyproject,sha256=GLD8GN9dXx9wNbtnevrxqqcwk7vKV-Uv8QYSycdaoaI,33
 bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py,sha256=qSQTeCzIUn8rgDkjIM47Rr3-fqg1uk8rDf_lCoY9gZw,1402
 bec_widgets/widgets/waveform/register_bec_waveform_widget.py,sha256=qZHVZH_lP2hvzkG1Ra0EyrXlMeLkRCy0aceH-bfJ1cs,490
-bec_widgets/widgets/waveform/waveform_widget.py,sha256=n6_8B4frmpZGGGx6eWntLsoL-CpJ0_Bca9oENWJTY0Y,22264
+bec_widgets/widgets/waveform/waveform_widget.py,sha256=nEIRz6mnBpVl2BTauQHMI_DJHXO7aO5HyuAsf8OrMag,22427
 bec_widgets/widgets/waveform/waveform_popups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=ApWv0n33TJBP59CQ4MUdyPRSiKfXjTdfui1IfwzFNjE,13172
+bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=VxbAtI_ZLfkrkTXqImQcNPwKDqFRWEj-vI8v6mmVMJ8,13025
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.ui,sha256=OaQE5HlyBQ3RQoHqxOFHiUoNcx8SDZP5sHJ9NNGhsPI,10404
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=XOHppMcONwfhAYpqIc51VOrpunWmPSn50sT3I0MjW2c,1173
@@ -249,8 +249,8 @@ bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEA
 bec_widgets/widgets/website/website.py,sha256=42pncCc_zI2eqeMArIurVmPUukRo5bTxa2h1Skah-io,3012
 bec_widgets/widgets/website/website_widget.pyproject,sha256=scOiV3cV1_BjbzpPzy2N8rIJL5P2qIZz8ObTJ-Uvdtg,25
 bec_widgets/widgets/website/website_widget_plugin.py,sha256=pz38_C2cZ0yvPPS02wdIPcmhFo_yiwUhflsASocAPQQ,1341
-bec_widgets-0.105.0.dist-info/METADATA,sha256=oeOXM8pekkxHvoDKlMGeTVyy__CKVPQW0zJqHpaimZs,1334
-bec_widgets-0.105.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.105.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.105.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.105.0.dist-info/RECORD,,
+bec_widgets-0.106.0.dist-info/METADATA,sha256=ffhpXp786ojh7YAGYizUsBPGvONAJlGKSpSvSaTL804,1334
+bec_widgets-0.106.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.106.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.106.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.106.0.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.105.0"
+version = "0.106.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [