bec-widgets 0.88.0__py3-none-any.whl → 0.88.1__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## v0.88.1 (2024-07-22)
+
+### Documentation
+
+* docs: readthedocs icon path fixed ([`2bcaa42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2bcaa4256d6daaefacb3ead8c72458d7b1498e29))
+
+### Fix
+
+* fix(plot_base): set_xy autorange moved to plotbase from waveform ([`a3dff7d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3dff7decc16115c12dc6b4ef1572552368da309))
+
+### Refactor
+
+* refactor(toolbar): generalizations of the ToolBarAction ([`ad112d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad112d1f08157f6987edd48a0bacf9f669ef1997))
+
 ## v0.88.0 (2024-07-19)
 
 ### Feature
@@ -112,8 +126,6 @@ Handles closeEvent() and RPC registering/unregistering ([`c7feb69`](https://gitl
 
 * feat(waveform): async readback update implemented for async devices ([`0c6a9f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0c6a9f2310df31ddcd68050a17cfbf52c3e2e226))
 
-* feat(waveform): data are taken directly from ScanItem which is defined from scan_status endpoint; scan update is triggered from scan_segment; plots can be added just specifying y_name -> best effort for setting x reported device ([`b8717f1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8717f13276734dd655ab03cd6005985ad5af9fb))
-
 ### Fix
 
 * fix(waveform): timestamp are not converted to human readable format ([`e495fd3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e495fd30c4c16474689943c7263e3060cb09ffb4))
@@ -124,12 +136,6 @@ Handles closeEvent() and RPC registering/unregistering ([`c7feb69`](https://gitl
 
 * fix(waveform): dap leaked RID for all daps in current process; dap RID is now f"{scan_id}-{gui_id}" to distinguish for each plot instance ([`d23fd8b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d23fd8bd074ede6e14eb8e85e025cbced4bd45ef))
 
-* fix(waveform): only one type of x axis allowed; x mode validated ([`9d6ae87`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9d6ae87d0f03ca227570fcca8af2d8190828d271))
-
-* fix(waveform): data for axis are taken by separate method; validation consolidated ([`fc5a8bd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc5a8bdd8b260f5e9b59ec71a4610c57442e43fe))
-
-* fix(bec_dispatcher): connect_slot can accept kwargs ([`0aa317a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0aa317aae58d3612d46f05b85f8b0db3d12bbe14))
-
 ### Refactor
 
 * refactor(waveform): plot can be prompted without specifying kwargs ([`48911e9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/48911e934815923c94edb5ced6042058a11a97f5))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.88.0
+Version: 0.88.1
 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

@@ -2057,6 +2057,19 @@ class BECWaveformWidget(RPCBase):
             legend_label_size(int): Size of the legend labels.
         """
 
+    @rpc_call
+    def set_auto_range(self, enabled: "bool", axis: "str" = "xy"):
+        """
+        Set the auto range of the plot widget.
+
+        Args:
+            enabled(bool): If True, enable the auto range.
+            axis(str, optional): The axis to enable the auto range.
+                - "xy": Enable auto range for both x and y axis.
+                - "x": Enable auto range for x axis.
+                - "y": Enable auto range for y axis.
+        """
+
     @rpc_call
     def set_grid(self, x_grid: "bool", y_grid: "bool"):
         """

bec_widgets/qt_utils/toolbar.py

@@ -1,12 +1,35 @@
+# pylint: disable=no-name-in-module
+import os
 from abc import ABC, abstractmethod
 from collections import defaultdict
 
-# pylint: disable=no-name-in-module
 from qtpy.QtCore import QSize
-from qtpy.QtWidgets import QToolBar, QToolButton, QWidget
+from qtpy.QtGui import QAction, QIcon
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QToolBar, QToolButton, QWidget
+
+import bec_widgets
+
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class ToolBarAction(ABC):
+    """
+    Abstract base class for toolbar actions.
+
+    Args:
+        icon_path (str, optional): The name of the icon file from `assets/toolbar_icons`. Defaults to None.
+        tooltip (bool, optional): The tooltip for the action. Defaults to None.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+    """
+
+    def __init__(self, icon_path: str = None, tooltip: str = None, checkable: bool = False):
+        self.icon_path = (
+            os.path.join(MODULE_PATH, "assets", "toolbar_icons", icon_path) if icon_path else None
+        )
+        self.tooltip = tooltip
+        self.checkable = checkable
+        self.action = None
+
     @abstractmethod
     def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
         """Adds an action or widget to a toolbar.
@@ -26,6 +49,55 @@ class SeparatorAction(ToolBarAction):
         toolbar.addWidget(self.separator)
 
 
+class IconAction(ToolBarAction):
+    """
+    Action with an icon for the toolbar.
+
+    Args:
+        icon_path (str): The path to the icon file.
+        tooltip (str): The tooltip for the action.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+    """
+
+    def __init__(self, icon_path: str = None, tooltip: str = None, checkable: bool = False):
+        super().__init__(icon_path, tooltip, checkable)
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        icon = QIcon()
+        icon.addFile(self.icon_path, size=QSize(20, 20))
+        self.action = QAction(icon, self.tooltip, target)
+        self.action.setCheckable(self.checkable)
+        toolbar.addAction(self.action)
+
+
+class DeviceSelectionAction(ToolBarAction):
+    """
+    Action for selecting a device in a combobox.
+
+    Args:
+        label (str): The label for the combobox.
+        device_combobox (DeviceComboBox): The combobox for selecting the device.
+
+    """
+
+    def __init__(self, label: str, device_combobox):
+        super().__init__()
+        self.label = label
+        self.device_combobox = device_combobox
+        self.device_combobox.currentIndexChanged.connect(lambda: self.set_combobox_style("#ffa700"))
+
+    def add_to_toolbar(self, toolbar, target):
+        widget = QWidget()
+        layout = QHBoxLayout(widget)
+        label = QLabel(f"{self.label}")
+        layout.addWidget(label)
+        layout.addWidget(self.device_combobox)
+        toolbar.addWidget(widget)
+
+    def set_combobox_style(self, color: str):
+        self.device_combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
+
+
 class ModularToolBar(QToolBar):
     """Modular toolbar with optional automatic initialization.
     Args:

bec_widgets/widgets/figure/plots/plot_base.py

@@ -291,6 +291,19 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         """
         self.plot_item.setAspectLocked(lock)
 
+    def set_auto_range(self, enabled: bool, axis: str = "xy"):
+        """
+        Set the auto range of the plot widget.
+
+        Args:
+            enabled(bool): If True, enable the auto range.
+            axis(str, optional): The axis to enable the auto range.
+                - "xy": Enable auto range for both x and y axis.
+                - "x": Enable auto range for x axis.
+                - "y": Enable auto range for y axis.
+        """
+        self.plot_item.enableAutoRange(axis, enabled)
+
     def export(self):
         """Show the Export Dialog of the plot widget."""
         scene = self.plot_item.scene()

bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py

@@ -3,6 +3,7 @@ import os
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
 
 DOM_XML = """
@@ -12,6 +13,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECMotorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -29,8 +32,7 @@ class BECMotorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Plots"
 
     def icon(self):
-        current_path = os.path.dirname(__file__)
-        icon_path = os.path.join(current_path, "assets", "motor_map.png")
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "motor_map.png")
         return QIcon(icon_path)
 
     def includeFile(self):

bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -5,17 +5,12 @@ import sys
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
-from bec_widgets.qt_utils.toolbar import ModularToolBar
+from bec_widgets.qt_utils.toolbar import DeviceSelectionAction, IconAction, ModularToolBar
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import MotorMapConfig
 from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
-from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_toolbar import (
-    ConnectAction,
-    DeviceSelectionAction,
-    ResetHistoryAction,
-    SettingsAction,
-)
 
 
 class BECMotorMapWidget(BECWidget, QWidget):
@@ -53,11 +48,15 @@ class BECMotorMapWidget(BECWidget, QWidget):
         self.fig = BECFigure()
         self.toolbar = ModularToolBar(
             actions={
-                "motor_x": DeviceSelectionAction("Motor X:"),
-                "motor_y": DeviceSelectionAction("Motor Y:"),
-                "connect": ConnectAction(),
-                "history": ResetHistoryAction(),
-                "config": SettingsAction(),
+                "motor_x": DeviceSelectionAction(
+                    "Motor X:", DeviceComboBox(device_filter="Positioner")
+                ),
+                "motor_y": DeviceSelectionAction(
+                    "Motor Y:", DeviceComboBox(device_filter="Positioner")
+                ),
+                "connect": IconAction(icon_path="connection.svg", tooltip="Connect Motors"),
+                "history": IconAction(icon_path="history.svg", tooltip="Reset Trace History"),
+                "config": IconAction(icon_path="settings.svg", tooltip="Open Configuration Dialog"),
             },
             target_widget=self,
         )

bec_widgets/widgets/waveform/waveform_widget.py

@@ -5,22 +5,20 @@ from typing import Literal
 
 import numpy as np
 import pyqtgraph as pg
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
-from bec_widgets.qt_utils.toolbar import ModularToolBar, SeparatorAction
+from bec_widgets.qt_utils.toolbar import IconAction, ModularToolBar, SeparatorAction
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
 from bec_widgets.widgets.figure.plots.waveform.waveform import Waveform1DConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import BECCurve
-from bec_widgets.widgets.waveform.waveform_toolbar.curve_dialog.curve_dialog import CurveSettings
-from bec_widgets.widgets.waveform.waveform_toolbar.dap_summary_dialog.dap_summary_dialog import (
+from bec_widgets.widgets.waveform.waveform_popups.curve_dialog.curve_dialog import CurveSettings
+from bec_widgets.widgets.waveform.waveform_popups.dap_summary_dialog.dap_summary_dialog import (
     FitSummaryWidget,
 )
-from bec_widgets.widgets.waveform.waveform_toolbar.waveform_toolbar import *
 
 try:
     import pandas as pd
@@ -47,6 +45,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         "set_x_lim",
         "set_y_lim",
         "set_legend_label_size",
+        "set_auto_range",
         "set_grid",
         "lock_aspect_ratio",
         "export",
@@ -75,19 +74,28 @@ class BECWaveformWidget(BECWidget, QWidget):
         self.fig = BECFigure()
         self.toolbar = ModularToolBar(
             actions={
-                "save": SaveAction(),
-                "matplotlib": MatplotlibAction(),
+                "save": IconAction(icon_path="save.svg", tooltip="Open Export Dialog"),
+                "matplotlib": IconAction(
+                    icon_path="photo_library.svg", tooltip="Open Matplotlib Plot"
+                ),
                 "separator_1": SeparatorAction(),
-                "drag_mode": DragModeAction(),
-                "rectangle_mode": RectangeModeAction(),
-                "auto_range": AutoRangeAction(),
+                "drag_mode": IconAction(
+                    icon_path="drag_pan_mode.svg", tooltip="Drag Mouse Mode", checkable=True
+                ),
+                "rectangle_mode": IconAction(
+                    icon_path="rectangle_mode.svg", tooltip="Rectangle Zoom Mode", checkable=True
+                ),
+                "auto_range": IconAction(icon_path="auto_range.svg", tooltip="Autorange Plot"),
                 "separator_2": SeparatorAction(),
-                "curves": CurveAction(),
-                "fit_params": FitParamsAction(),
-                "axis_settings": SettingsAction(),
-                # "separator_3": SeparatorAction(),
-                # "import": ImportAction(),
-                # "export": ExportAction(),
+                "curves": IconAction(
+                    icon_path="line_axis.svg", tooltip="Open Curves Configuration"
+                ),
+                "fit_params": IconAction(
+                    icon_path="fitting_parameters.svg", tooltip="Open Fitting Parameters"
+                ),
+                "axis_settings": IconAction(
+                    icon_path="settings.svg", tooltip="Open Configuration Dialog"
+                ),
             },
             target_widget=self,
         )

{bec_widgets-0.88.0.dist-info → bec_widgets-0.88.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.88.0
+Version: 0.88.1
 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.88.0.dist-info → bec_widgets-0.88.1.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=zvb4A6QI5lQTsdfI5nPPL-tUNfcrz__SQjxW03QZ5Ek,8204
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=Cg7hwqHhrIkyyabuoKi2_GBGf2qCr5D4-41C1-kKuFo,8161
+CHANGELOG.md,sha256=HlkAp2hTCYOR0AGFikpdOCSm3k4dOGmdIqhAU-hKIB8,7845
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=Q7jSMAX05ltg_SwmOLHmPtuTqoUeD06Z7WdFJnDLIMc,1308
+PKG-INFO,sha256=PhNXXQmzzTVoVSMDhrCnMZDZWDJq9NgDdg9W56mXnfg,1308
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=p3KQpk_Kzo3cOeqBMjLywMn9OO3ygOO9In4jTzXPRfk,2357
+pyproject.toml,sha256=vQNtHmvPPn_W8rQf_4N6FH0JxA1rV254WjNiZan3A5I,2357
 .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
@@ -17,11 +17,14 @@ bec_widgets/assets/app_icons/bec_widgets_icon.png,sha256=K8dgGwIjalDh9PRHUsSQBqg
 bec_widgets/assets/app_icons/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uftXCH9ws,3889
 bec_widgets/assets/designer_icons/BECWaveformWidget.png,sha256=QKocOi6e1frT6anrTwIQqQEwkalbl2AoOrTpvN1dr90,3764
 bec_widgets/assets/designer_icons/colormap_selector.png,sha256=KULLUA5T9SLhcSyrdouG07nXHZtE-LNNOn0ghG7T-OQ,6831
+bec_widgets/assets/designer_icons/motor_map.png,sha256=8iqST5mTnZfv9rN9rx3D-XBm232Mwvzz9D0Wx6QaT8I,7293
 bec_widgets/assets/toolbar_icons/add.svg,sha256=Co1Iueh0sqQ1LMQcvNXPLg6tC6MLtQviH-F79uhM2o0,228
 bec_widgets/assets/toolbar_icons/auto_range.svg,sha256=hq6YMySVWF01SeEXzpF_h7BaqUPdsipTk_Z3nOjD8bg,487
+bec_widgets/assets/toolbar_icons/connection.svg,sha256=czIb1BnshmxJnER8ssU3WcLENrFSIUfMwberajWOGAk,341
 bec_widgets/assets/toolbar_icons/drag_pan_mode.svg,sha256=ruinkJ0dVEPSH7ll4Pufl9c7oTwVXvcN57oTgiVRY5I,470
 bec_widgets/assets/toolbar_icons/export.svg,sha256=-kDEfxzloR1fOpZ5d4KIkxGH7wS_4Z1uJImtnKA5XxU,371
 bec_widgets/assets/toolbar_icons/fitting_parameters.svg,sha256=k57fFm2xPyYQD0y1K4Mb-7uqDeVA6GBWq_oh4-rQQeE,366
+bec_widgets/assets/toolbar_icons/history.svg,sha256=bd6p5saxRiNRpd5OsSwIOvRWvel0WFEHul9zw4y9vH0,392
 bec_widgets/assets/toolbar_icons/import.svg,sha256=57-0ahjyIng5d3c0pSVCC2YwEYmQSyVVUdWkQXiVEVY,377
 bec_widgets/assets/toolbar_icons/line_axis.svg,sha256=uguelNycsOl6DmjYfUPnPnkIxfrDHEiLCpHW7iKEyfk,450
 bec_widgets/assets/toolbar_icons/photo_library.svg,sha256=weiDCYiHh9dzcA21D-37zpYts2CyoGAd9x-N_h292Mo,564
@@ -31,7 +34,7 @@ bec_widgets/assets/toolbar_icons/save.svg,sha256=rexWzbFExkh-NiAFP1909-1mm1BKU76
 bec_widgets/assets/toolbar_icons/settings.svg,sha256=ro30oa9CF1YijOXoUl-hz2DilJcqTy4rlTrMYhggumQ,1473
 bec_widgets/cli/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 bec_widgets/cli/auto_updates.py,sha256=DyBV3HnjMSH-cvVkYNcDiYKVf0Xut4Qy2qGQqkW47Bw,4833
-bec_widgets/cli/client.py,sha256=-fJ0QirirJ4ZGXNgfXLUL1VmuYfYJdp_50o3jpEvY_Q,70291
+bec_widgets/cli/client.py,sha256=RfaS3iyxPG8yUXDdFo-b0S9F4S62f7cwbAgDTO47tOs,70757
 bec_widgets/cli/client_utils.py,sha256=cDhabblwaP88a0jlVpbn_RWWKVbsyjhmmGtMh9gesEw,12388
 bec_widgets/cli/generate_cli.py,sha256=Ea5px9KblUlcGg-1JbJBTIU7laGg2n8PM7Efw9WVVzM,5889
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
@@ -50,7 +53,7 @@ bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py,sha256=LNwplI6de
 bec_widgets/qt_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/qt_utils/error_popups.py,sha256=WAN3Qtccy9Yww29kZ3HbLt9VyipgrIamJ6y4PhGTe3I,7983
 bec_widgets/qt_utils/settings_dialog.py,sha256=rR_Zk4RGTnI4dz5OEzCc13lVpxlOKuwOf4_7wqXSbRw,3373
-bec_widgets/qt_utils/toolbar.py,sha256=yzxCmZ7c00B2JD1TkUpPeQgM_-v7zuTYe38Qkw_yvrc,2430
+bec_widgets/qt_utils/toolbar.py,sha256=Ob7zItx06CbQIibInLLKyOXDJ2QiAneGL8Ubyn5iwNo,4892
 bec_widgets/utils/__init__.py,sha256=1930ji1Jj6dVuY81Wd2kYBhHYNV-2R0bN_L4o9zBj1U,533
 bec_widgets/utils/bec_connector.py,sha256=UK0GIWgcC_JTwgKCOmmuXnQvSwD3wiPsJQw6NBW3p74,9961
 bec_widgets/utils/bec_designer.py,sha256=ak3G8FdojUPjVBBwdPXw7tN5P2Uxr-SSoQt394jXeAA,4308
@@ -125,7 +128,7 @@ bec_widgets/widgets/figure/figure.py,sha256=IP8Kr8mWOBRSeWsB17UYoU5bpE4WcrOCuN5H
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/axis_settings.py,sha256=_z20SrMu5iRM0eqhQjsCV1MDOY80hN2dqtvkeofXs0w,3510
 bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=zMKZK6lH_3KJGO4RA_paXAH7UzZJ4Snlil3MK4pK3L8,11589
-bec_widgets/widgets/figure/plots/plot_base.py,sha256=xU2aRfSOdGNsIl-fJ1PZDNm5b4h70akFbtHq7h38ydk,10419
+bec_widgets/widgets/figure/plots/plot_base.py,sha256=AxzH2J-bLngxlWcgWWgNpLhIQxQzFz-H6yLf5Dou93Y,10921
 bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/image/image.py,sha256=CoD1ODroBL0M-9xCyAyELz-UBSHGMoXqe_1GqhGrRN0,21294
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=TyarahdWEn0jgalj5fqSAmcznXSbENkqHrrlL2GVdU4,10558
@@ -139,17 +142,12 @@ bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=mBKM89H6SuHuFy1lQg1n8s1gQiN5QEkZf0xua8aPDns,2402
 bec_widgets/widgets/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject,sha256=NAI8s5gRKz80ED4KY7OgD2OgSH5HEsjt2ux2BYp66yg,63
-bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=TpRrkyUpdsDhzn7yZnbqk2FktXH98Gjo-gH8UN4Dis0,1276
-bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=HoGS9mbaNG0pPIMQ7Xm0LB3p2trtINj1wq9_oLJEQ3w,7296
+bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=V6iN82E8Za8BharR_cSyZZShh4fI9yc5ky2TQBGELR0,1316
+bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=URcysThbJKGsCZUqQm2lCtVn5FG8t4kT7DaN5EJUexg,7555
 bec_widgets/widgets/motor_map/register_bec_motor_map_widget.py,sha256=qRG8PtWGjso0pWbvj_DXKnbUfmQzfGqPSrnAozXfM7o,492
-bec_widgets/widgets/motor_map/assets/connection.svg,sha256=czIb1BnshmxJnER8ssU3WcLENrFSIUfMwberajWOGAk,341
-bec_widgets/widgets/motor_map/assets/history.svg,sha256=bd6p5saxRiNRpd5OsSwIOvRWvel0WFEHul9zw4y9vH0,392
-bec_widgets/widgets/motor_map/assets/motor_map.png,sha256=xd6GFBM8gAb5c-xRgswxTZFtvo449yK57-EbkFvidOI,9746
-bec_widgets/widgets/motor_map/assets/settings.svg,sha256=ro30oa9CF1YijOXoUl-hz2DilJcqTy4rlTrMYhggumQ,1473
 bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=terJ5NHRzAsiUwdqg-hTbkQ5gadnRT0Ol0_Fm66kPF4,2011
 bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui,sha256=nv5vPftt6vcIl60OOZLRvwD29rdHVWOoGmz168BnwKw,2685
-bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py,sha256=R6pmxhB_1ouc6f6cNQQvbxTHb3Ko3K_gTGs5WIYgnRI,2194
 bec_widgets/widgets/position_indicator/position_indicator.py,sha256=QVlWvs_RvEJe5IMxGYCpi-CXYF7vFeMqEMFCs6u5NGc,2020
 bec_widgets/widgets/position_indicator/position_indicator.pyproject,sha256=s0JEf5YkpMag19ddFSYeRZ8erBau7erO3bqw05YrTyg,36
 bec_widgets/widgets/position_indicator/position_indicator_plugin.py,sha256=h9EQU4t6KdKVAZh5ILalpl1K8b7JMHf-2AFYREej2-w,1241
@@ -184,19 +182,18 @@ 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=LjJJoRFlkcQWs7SUIPX859AeCiqVRsjgRWMNKE596uY,1429
 bec_widgets/widgets/waveform/register_bec_waveform_widget.py,sha256=qZHVZH_lP2hvzkG1Ra0EyrXlMeLkRCy0aceH-bfJ1cs,490
-bec_widgets/widgets/waveform/waveform_widget.py,sha256=ZRhwyxhrCwQxQJIusHy8oMi-PKmDzebP0GPiQawP-Sg,18636
-bec_widgets/widgets/waveform/waveform_toolbar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_toolbar/waveform_toolbar.py,sha256=n3hwAzLCQul-FviDn0ikhDsYvza7JOb30ekTmbhu9JY,3896
-bec_widgets/widgets/waveform/waveform_toolbar/curve_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_toolbar/curve_dialog/curve_dialog.py,sha256=jCtWjNxsdOW7fA9BLdMAMrlCKHr2tFMHcVMxpeJ6YZE,13107
-bec_widgets/widgets/waveform/waveform_toolbar/curve_dialog/curve_dialog.ui,sha256=OaQE5HlyBQ3RQoHqxOFHiUoNcx8SDZP5sHJ9NNGhsPI,10404
-bec_widgets/widgets/waveform/waveform_toolbar/dap_summary_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_toolbar/dap_summary_dialog/dap_summary.ui,sha256=PFEKro61UXd-jmx65U4pqJ5D29DXtVnhQRnsnDvN-wM,6138
-bec_widgets/widgets/waveform/waveform_toolbar/dap_summary_dialog/dap_summary_dialog.py,sha256=a5n_gBebETdj80TU7Dgy1cnazPFyxLlWk_lRdvy3qA4,2403
+bec_widgets/widgets/waveform/waveform_widget.py,sha256=zErnkgwm69QZEVvNRLi57v9-zRQeu0IaJpYRj34mGmA,19125
+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=jCtWjNxsdOW7fA9BLdMAMrlCKHr2tFMHcVMxpeJ6YZE,13107
+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.ui,sha256=PFEKro61UXd-jmx65U4pqJ5D29DXtVnhQRnsnDvN-wM,6138
+bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=a5n_gBebETdj80TU7Dgy1cnazPFyxLlWk_lRdvy3qA4,2403
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/website/website.py,sha256=FmhVaasAU3ZSdKP-HHSnJHFbG8lIsNAPH9pZq55fhic,1731
 docs/Makefile,sha256=i2WHuFlgfyAPEW4ssEP8NY4cOibDJrVjvzSEU8_Ggwc,634
-docs/conf.py,sha256=HxLxupNGu0Smhwn57g1kFdjZzFuaWVREgRJKhT1zi2k,2464
+docs/conf.py,sha256=__ETwe00VJvH5_570r-oZpLkTrHYlobMCEcknjYPyjo,2474
 docs/index.md,sha256=8ZCgaLIbJsYvt-jwi--QxsNwnK4-k3rejIeOOLclG40,1101
 docs/make.bat,sha256=vKazJE8RW49Cy8K7hm8QYbletvAd8YkeKsaPA_dWnXs,800
 docs/requirements.txt,sha256=TcjRnzVYFOg64N-lJc2sn-G6YQdhPjzp0lrLuPsPMXY,156
@@ -300,8 +297,8 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.88.0.dist-info/METADATA,sha256=Q7jSMAX05ltg_SwmOLHmPtuTqoUeD06Z7WdFJnDLIMc,1308
-bec_widgets-0.88.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.88.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.88.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.88.0.dist-info/RECORD,,
+bec_widgets-0.88.1.dist-info/METADATA,sha256=PhNXXQmzzTVoVSMDhrCnMZDZWDJq9NgDdg9W56mXnfg,1308
+bec_widgets-0.88.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.88.1.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.88.1.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.88.1.dist-info/RECORD,,

docs/conf.py

@@ -78,4 +78,4 @@ language = "Python"
 html_theme = "pydata_sphinx_theme"
 html_static_path = ["_static"]
 html_css_files = ["custom.css"]
-html_logo = "../bec_widgets/assets/bec_widgets_icon.png"
+html_logo = "../bec_widgets/assets/app_icons/bec_widgets_icon.png"

pyproject.toml

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

bec_widgets/widgets/motor_map/assets/settings.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#FFFFFF">
-    <path d="M0 0h24v24H0V0z" fill="none"/>
-    <path d="M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.09-.16-.26-.25-.44-.25-.06 0-.12.01-.17.03l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.06-.02-.12-.03-.18-.03-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.09.16.26.25.44.25.06 0 .12-.01.17-.03l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
-</svg>

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py

@@ -1,59 +0,0 @@
-import os
-
-from qtpy.QtCore import QSize
-from qtpy.QtGui import QAction, QIcon
-from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
-
-from bec_widgets.qt_utils.toolbar import ToolBarAction
-from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
-
-
-class DeviceSelectionAction(ToolBarAction):
-    def __init__(self, label: str):
-        self.label = label
-        self.device_combobox = DeviceComboBox(device_filter="Positioner")
-
-        self.device_combobox.currentIndexChanged.connect(lambda: self.set_combobox_style("#ffa700"))
-
-    def add_to_toolbar(self, toolbar, target):
-        widget = QWidget()
-        layout = QHBoxLayout(widget)
-
-        label = QLabel(f"{self.label}")
-
-        layout.addWidget(label)
-        layout.addWidget(self.device_combobox)
-        toolbar.addWidget(widget)
-
-    def set_combobox_style(self, color: str):
-        self.device_combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
-
-
-class ConnectAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        current_path = os.path.dirname(__file__)
-        parent_path = os.path.dirname(current_path)
-        icon = QIcon()
-        icon.addFile(os.path.join(parent_path, "assets", "connection.svg"), size=QSize(20, 20))
-        self.action = QAction(icon, "Connect Motors", target)
-        toolbar.addAction(self.action)
-
-
-class ResetHistoryAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        current_path = os.path.dirname(__file__)
-        parent_path = os.path.dirname(current_path)
-        icon = QIcon()
-        icon.addFile(os.path.join(parent_path, "assets", "history.svg"), size=QSize(20, 20))
-        self.action = QAction(icon, "Reset Trace History", target)
-        toolbar.addAction(self.action)
-
-
-class SettingsAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        current_path = os.path.dirname(__file__)
-        parent_path = os.path.dirname(current_path)
-        icon = QIcon()
-        icon.addFile(os.path.join(parent_path, "assets", "settings.svg"), size=QSize(20, 20))
-        self.action = QAction(icon, "Open Configuration Dialog", target)
-        toolbar.addAction(self.action)

bec_widgets/widgets/waveform/waveform_toolbar/waveform_toolbar.py

@@ -1,117 +0,0 @@
-import os
-
-from qtpy.QtCore import QSize
-from qtpy.QtGui import QAction, QIcon
-
-import bec_widgets
-from bec_widgets.qt_utils.toolbar import ToolBarAction
-
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-
-
-class SaveAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "save.svg"), size=QSize(20, 20)
-        )
-        self.action = QAction(icon, "Open Export Dialog", target)
-        toolbar.addAction(self.action)
-
-
-class MatplotlibAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "photo_library.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Open Matplotlib Plot", target)
-        toolbar.addAction(self.action)
-
-
-class DragModeAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "drag_pan_mode.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Drag Mouse Mode", target)
-        self.action.setCheckable(True)
-        toolbar.addAction(self.action)
-
-
-class RectangeModeAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "rectangle_mode.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Rectangle Zoom Mode", target)
-        self.action.setCheckable(True)
-        toolbar.addAction(self.action)
-
-
-class AutoRangeAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "auto_range.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Autorange Plot", target)
-        toolbar.addAction(self.action)
-
-
-class CurveAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "line_axis.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Open Curves Configuration", target)
-        toolbar.addAction(self.action)
-
-
-class FitParamsAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "fitting_parameters.svg"),
-            size=QSize(20, 20),
-        )
-        self.action = QAction(icon, "Open Fitting Parameters", target)
-        toolbar.addAction(self.action)
-
-
-class SettingsAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "settings.svg"), size=QSize(20, 20)
-        )
-        self.action = QAction(icon, "Open Configuration Dialog", target)
-        toolbar.addAction(self.action)
-
-
-class ImportAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "import.svg"), size=QSize(20, 20)
-        )
-        self.action = QAction(icon, "Import Configuration from YAML", target)
-        toolbar.addAction(self.action)
-
-
-class ExportAction(ToolBarAction):
-    def add_to_toolbar(self, toolbar, target):
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "export.svg"), size=QSize(20, 20)
-        )
-        self.action = QAction(icon, "Export Current Configuration to YAML", target)
-        toolbar.addAction(self.action)