bec-widgets 0.99.1__py3-none-any.whl → 0.99.9__py3-none-any.whl

bec_widgets/widgets/dock/dock.py

@@ -100,6 +100,7 @@ class CustomDockLabel(DockLabel):
 
 
 class BECDock(BECWidget, Dock):
+    ICON_NAME = "widgets"
     USER_ACCESS = [
         "_config_dict",
         "_rpc_id",

bec_widgets/widgets/dock/dock_area.py

@@ -7,7 +7,7 @@ from pydantic import Field
 from pyqtgraph.dockarea.DockArea import DockArea
 from qtpy.QtCore import Qt
 from qtpy.QtGui import QPainter, QPaintEvent
-from qtpy.QtWidgets import QVBoxLayout, QWidget
+from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.qt_utils.toolbar import (
@@ -18,7 +18,17 @@ from bec_widgets.qt_utils.toolbar import (
 )
 from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
 from bec_widgets.widgets.dock.dock import BECDock, DockConfig
+from bec_widgets.widgets.image.image_widget import BECImageWidget
+from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.ring_progress_bar.ring_progress_bar import RingProgressBar
+from bec_widgets.widgets.scan_control.scan_control import ScanControl
+from bec_widgets.widgets.vscode.vscode import VSCodeEditor
+from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 
 class DockAreaConfig(ConnectionConfig):
@@ -71,13 +81,17 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Plot ",
                     actions={
                         "waveform": MaterialIconAction(
-                            icon_name="show_chart", tooltip="Add Waveform", filled=True
+                            icon_name=BECWaveformWidget.ICON_NAME,
+                            tooltip="Add Waveform",
+                            filled=True,
                         ),
                         "image": MaterialIconAction(
-                            icon_name="image", tooltip="Add Image", filled=True
+                            icon_name=BECImageWidget.ICON_NAME, tooltip="Add Image", filled=True
                         ),
                         "motor_map": MaterialIconAction(
-                            icon_name="my_location", tooltip="Add Motor Map", filled=True
+                            icon_name=BECMotorMapWidget.ICON_NAME,
+                            tooltip="Add Motor Map",
+                            filled=True,
                         ),
                     },
                 ),
@@ -86,10 +100,10 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Device Control ",
                     actions={
                         "scan_control": MaterialIconAction(
-                            icon_name="stacked_line_chart", tooltip="Add Scan Control", filled=True
+                            icon_name=ScanControl.ICON_NAME, tooltip="Add Scan Control", filled=True
                         ),
                         "positioner_box": MaterialIconAction(
-                            icon_name="switch_right", tooltip="Add Device Box", filled=True
+                            icon_name=PositionerBox.ICON_NAME, tooltip="Add Device Box", filled=True
                         ),
                     },
                 ),
@@ -98,16 +112,18 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Utils ",
                     actions={
                         "queue": MaterialIconAction(
-                            icon_name="edit_note", tooltip="Add Scan Queue", filled=True
+                            icon_name=BECQueue.ICON_NAME, tooltip="Add Scan Queue", filled=True
                         ),
                         "vs_code": MaterialIconAction(
-                            icon_name="show_chart", tooltip="Add VS Code", filled=True
+                            icon_name=VSCodeEditor.ICON_NAME, tooltip="Add VS Code", filled=True
                         ),
                         "status": MaterialIconAction(
-                            icon_name="dns", tooltip="Add BEC Status Box", filled=True
+                            icon_name=BECStatusBox.ICON_NAME,
+                            tooltip="Add BEC Status Box",
+                            filled=True,
                         ),
                         "progress_bar": MaterialIconAction(
-                            icon_name="track_changes",
+                            icon_name=RingProgressBar.ICON_NAME,
                             tooltip="Add Circular ProgressBar",
                             filled=True,
                         ),
@@ -127,6 +143,10 @@ class BECDockArea(BECWidget, QWidget):
 
         self.layout.addWidget(self.toolbar)
         self.layout.addWidget(self.dock_area)
+        self.spacer = QWidget()
+        self.spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.toolbar.addWidget(self.spacer)
+        self.toolbar.addWidget(DarkModeButton(toolbar=True))
         self._hook_toolbar()
 
     def _hook_toolbar(self):

bec_widgets/widgets/dock/dock_area_plugin.py

@@ -34,7 +34,7 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Plots"
 
     def icon(self):
-        return designer_material_icon("widgets")
+        return designer_material_icon(BECDockArea.ICON_NAME)
 
     def includeFile(self):
         return "dock_area"

bec_widgets/widgets/figure/figure.py

@@ -252,7 +252,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         y_entry: str | None = None,
         z_entry: str | None = None,
         color: str | None = None,
-        color_map_z: str | None = "plasma",
+        color_map_z: str | None = "magma",
         label: str | None = None,
         validate: bool = True,
         new: bool = False,

bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -26,7 +26,7 @@ from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
 
 class Waveform1DConfig(SubplotConfig):
     color_palette: Optional[str] = Field(
-        "plasma", description="The color palette of the figure widget.", validate_default=True
+        "magma", description="The color palette of the figure widget.", validate_default=True
     )
     curves: dict[str, CurveConfig] = Field(
         {}, description="The list of curves to be added to the 1D waveform widget."
@@ -269,7 +269,7 @@ class BECWaveform(BECPlotBase):
         y_entry: str | None = None,
         z_entry: str | None = None,
         color: str | None = None,
-        color_map_z: str | None = "plasma",
+        color_map_z: str | None = "magma",
         label: str | None = None,
         validate: bool = True,
         dap: str | None = None,  # TODO add dap custom curve wrapper
@@ -451,8 +451,10 @@ class BECWaveform(BECPlotBase):
         color = (
             color
             or Colors.golden_angle_color(
-                colormap=self.config.color_palette, num=len(self.plot_item.curves) + 1, format="HEX"
-            )[-1]
+                colormap=self.config.color_palette,
+                num=max(10, len(self.plot_item.curves) + 1),
+                format="HEX",
+            )[len(self.plot_item.curves)]
         )
 
         # Create curve by config
@@ -479,7 +481,7 @@ class BECWaveform(BECPlotBase):
         y_entry: str | None = None,
         z_entry: str | None = None,
         color: str | None = None,
-        color_map_z: str | None = "plasma",
+        color_map_z: str | None = "magma",
         label: str | None = None,
         validate_bec: bool = True,
         dap: str | None = None,
@@ -546,9 +548,12 @@ class BECWaveform(BECPlotBase):
         color = (
             color
             or Colors.golden_angle_color(
-                colormap=self.config.color_palette, num=len(self.plot_item.curves) + 1, format="HEX"
-            )[-1]
+                colormap=self.config.color_palette,
+                num=max(10, len(self.plot_item.curves) + 1),
+                format="HEX",
+            )[len(self.plot_item.curves)]
         )
+        print(f"Color: {color}")
 
         # Create curve by config
         curve_config = CurveConfig(

bec_widgets/widgets/figure/plots/waveform/waveform_curve.py

@@ -44,15 +44,15 @@ class CurveConfig(ConnectionConfig):
     symbol_color: Optional[str | tuple] = Field(
         None, description="The color of the symbol of the curve."
     )
-    symbol_size: Optional[int] = Field(5, description="The size of the symbol of the curve.")
-    pen_width: Optional[int] = Field(2, description="The width of the pen of the curve.")
+    symbol_size: Optional[int] = Field(7, description="The size of the symbol of the curve.")
+    pen_width: Optional[int] = Field(4, description="The width of the pen of the curve.")
     pen_style: Optional[Literal["solid", "dash", "dot", "dashdot"]] = Field(
         "solid", description="The style of the pen of the curve."
     )
     source: Optional[str] = Field(None, description="The source of the curve.")
     signals: Optional[Signal] = Field(None, description="The signal of the curve.")
     color_map_z: Optional[str] = Field(
-        "plasma", description="The colormap of the curves z gradient.", validate_default=True
+        "magma", description="The colormap of the curves z gradient.", validate_default=True
     )
 
     model_config: dict = {"validate_assignment": True}

bec_widgets/widgets/image/bec_image_widget_plugin.py

@@ -34,7 +34,7 @@ class BECImageWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Plots"
 
     def icon(self):
-        return designer_material_icon("image")
+        return designer_material_icon(BECImageWidget.ICON_NAME)
 
     def includeFile(self):
         return "bec_image_widget"

bec_widgets/widgets/image/image_widget.py

@@ -23,6 +23,7 @@ from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem
 
 
 class BECImageWidget(BECWidget, QWidget):
+    ICON_NAME = "image"
     USER_ACCESS = [
         "image",
         "set",

bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py

@@ -32,7 +32,7 @@ class BECMotorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Plots"
 
     def icon(self):
-        return designer_material_icon("my_location")
+        return designer_material_icon(BECMotorMapWidget.ICON_NAME)
 
     def includeFile(self):
         return "bec_motor_map_widget"

bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -14,6 +14,7 @@ from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import Mo
 
 
 class BECMotorMapWidget(BECWidget, QWidget):
+    ICON_NAME = "my_location"
     USER_ACCESS = [
         "change_motors",
         "set_max_points",

bec_widgets/widgets/position_indicator/position_indicator.py

@@ -5,6 +5,8 @@ from qtpy.QtWidgets import QWidget
 
 class PositionIndicator(QWidget):
 
+    ICON_NAME = "horizontal_distribute"
+
     def __init__(self, parent=None):
         super().__init__(parent)
         self.position = 0.5

bec_widgets/widgets/position_indicator/position_indicator_plugin.py

@@ -34,7 +34,7 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("horizontal_distribute")
+        return designer_material_icon(PositionIndicator.ICON_NAME)
 
     def includeFile(self):
         return "position_indicator"

bec_widgets/widgets/positioner_box/positioner_box.py

@@ -28,6 +28,7 @@ class PositionerBox(BECWidget, QWidget):
     ui_file = "positioner_box.ui"
     dimensions = (234, 224)
 
+    ICON_NAME = "switch_right"
     USER_ACCESS = ["set_positioner"]
     device_changed = Signal(str, str)
 

bec_widgets/widgets/positioner_box/positioner_box_plugin.py

@@ -33,7 +33,7 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        return designer_material_icon("switch_right")
+        return designer_material_icon(PositionerBox.ICON_NAME)
 
     def includeFile(self):
         return "positioner_box"

bec_widgets/widgets/positioner_box/positioner_control_line.py

@@ -9,6 +9,8 @@ class PositionerControlLine(PositionerBox):
     ui_file = "positioner_control_line.ui"
     dimensions = (60, 600)  # height, width
 
+    ICON_NAME = "switch_left"
+
     def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
         """Initialize the DeviceControlLine.
 

bec_widgets/widgets/positioner_box/positioner_control_line_plugin.py

@@ -33,7 +33,7 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         return "Device Control"
 
     def icon(self):
-        return designer_material_icon("switch_left")
+        return designer_material_icon(PositionerControlLine.ICON_NAME)
 
     def includeFile(self):
         return "positioner_control_line"

bec_widgets/widgets/ring_progress_bar/ring_progress_bar.py

@@ -68,6 +68,7 @@ class RingProgressBarConfig(ConnectionConfig):
 
 
 class RingProgressBar(BECWidget, QWidget):
+    ICON_NAME = "track_changes"
     USER_ACCESS = [
         "_get_all_rpc",
         "_rpc_id",

bec_widgets/widgets/ring_progress_bar/ring_progress_bar_plugin.py

@@ -33,7 +33,7 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("track_changes")
+        return designer_material_icon(RingProgressBar.ICON_NAME)
 
     def includeFile(self):
         return "ring_progress_bar"

bec_widgets/widgets/scan_control/scan_control.py

@@ -20,6 +20,8 @@ from bec_widgets.widgets.stop_button.stop_button import StopButton
 
 class ScanControl(BECWidget, QWidget):
 
+    ICON_NAME = "tune"
+
     scan_started = Signal()
     scan_selected = Signal(str)
 

bec_widgets/widgets/scan_control/scan_control_plugin.py

@@ -1,10 +1,8 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
-import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.scan_control.scan_control import ScanControl
 
@@ -14,7 +12,6 @@ DOM_XML = """
     </widget>
 </ui>
 """
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -33,7 +30,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        return designer_material_icon("stacked_line_chart")
+        return designer_material_icon(ScanControl.ICON_NAME)
 
     def includeFile(self):
         return "scan_control"

bec_widgets/widgets/spinner/spinner.py

@@ -13,6 +13,8 @@ def ease_in_out_sine(t):
 
 
 class SpinnerWidget(QWidget):
+    ICON_NAME = "progress_activity"
+
     def __init__(self, parent=None):
         super().__init__(parent)
 

bec_widgets/widgets/spinner/spinner_widget_plugin.py

@@ -34,7 +34,7 @@ class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("progress_activity")
+        return designer_material_icon(SpinnerWidget.ICON_NAME)
 
     def includeFile(self):
         return "spinner_widget"

bec_widgets/widgets/stop_button/stop_button.py

@@ -7,6 +7,8 @@ from bec_widgets.utils.bec_widget import BECWidget
 class StopButton(BECWidget, QPushButton):
     """A button that stops the current scan."""
 
+    ICON_NAME = "dangerous"
+
     def __init__(self, parent=None, client=None, config=None, gui_id=None):
         super().__init__(client=client, config=config, gui_id=gui_id)
         QPushButton.__init__(self, parent=parent)

bec_widgets/widgets/stop_button/stop_button_plugin.py

@@ -34,7 +34,7 @@ class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("dangerous")
+        return designer_material_icon(StopButton.ICON_NAME)
 
     def includeFile(self):
         return "stop_button"

bec_widgets/widgets/text_box/text_box.py

@@ -31,6 +31,7 @@ class TextBoxConfig(ConnectionConfig):
 class TextBox(BECWidget, QTextEdit):
 
     USER_ACCESS = ["set_color", "set_text", "set_font_size"]
+    ICON_NAME = "chat"
 
     def __init__(self, parent=None, text: str = "", client=None, config=None, gui_id=None):
         if config is None:

bec_widgets/widgets/text_box/text_box_plugin.py

@@ -33,7 +33,7 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("chat")
+        return designer_material_icon(TextBox.ICON_NAME)
 
     def includeFile(self):
         return "text_box"

bec_widgets/widgets/toggle/toggle.py

@@ -11,6 +11,7 @@ class ToggleSwitch(QWidget):
     """
 
     enabled = Signal(bool)
+    ICON_NAME = "toggle_on"
 
     def __init__(self, parent=None):
         super().__init__(parent)

bec_widgets/widgets/toggle/toggle_switch_plugin.py

@@ -34,7 +34,7 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("toggle_on")
+        return designer_material_icon(ToggleSwitch.ICON_NAME)
 
     def includeFile(self):
         return "toggle_switch"

bec_widgets/widgets/vscode/vs_code_editor_plugin.py

@@ -34,7 +34,7 @@ class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Developer"
 
     def icon(self):
-        return designer_material_icon("developer_mode_tv")
+        return designer_material_icon(VSCodeEditor.ICON_NAME)
 
     def includeFile(self):
         return "vs_code_editor"

bec_widgets/widgets/vscode/vscode.py

@@ -18,6 +18,7 @@ class VSCodeEditor(WebsiteWidget):
     port = 7000
 
     USER_ACCESS = []
+    ICON_NAME = "developer_mode_tv"
 
     def __init__(self, parent=None, config=None, client=None, gui_id=None):
 

bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py

@@ -34,7 +34,7 @@ class BECWaveformWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Plots"
 
     def icon(self):
-        return designer_material_icon("show_chart")
+        return designer_material_icon(BECWaveformWidget.ICON_NAME)
 
     def includeFile(self):
         return "bec_waveform_widget"

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

@@ -5,8 +5,7 @@ from typing import Literal
 
 from bec_qthemes import material_icon
 from pydantic import BaseModel
-from qtpy.QtCore import QObject, QSize, Slot
-from qtpy.QtGui import QIcon
+from qtpy.QtCore import QObject, Slot
 from qtpy.QtWidgets import QComboBox, QLineEdit, QPushButton, QSpinBox, QTableWidget, QVBoxLayout
 
 import bec_widgets
@@ -121,10 +120,10 @@ class CurveSettings(SettingWidget):
             cm = self.ui.color_map_selector_dap.combo.currentText()
             table = self.ui.dap_table
         rows = table.rowCount()
-        colors = Colors.golden_angle_color(colormap=cm, num=rows + 1, format="HEX")
+        colors = Colors.golden_angle_color(colormap=cm, num=max(10, rows + 1), format="HEX")
         color_button_col = 2 if target == "scan" else 3
-        for row, color in zip(range(rows), colors):
-            table.cellWidget(row, color_button_col).setColor(color)
+        for row in range(rows):
+            table.cellWidget(row, color_button_col).setColor(colors[row])
 
     @Slot()
     def accept_changes(self):
@@ -251,12 +250,12 @@ class DialogRow(QObject):
         self.width = QSpinBox()
         self.width.setMinimum(1)
         self.width.setMaximum(20)
-        self.width.setValue(2)
+        self.width.setValue(4)
 
         self.symbol_size = QSpinBox()
         self.symbol_size.setMinimum(1)
         self.symbol_size.setMaximum(20)
-        self.symbol_size.setValue(5)
+        self.symbol_size.setValue(7)
 
         self.remove_button.clicked.connect(
             lambda: self.remove_row()
@@ -281,9 +280,10 @@ class DialogRow(QObject):
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
         else:
-            default_color = Colors.golden_angle_color(
-                colormap="magma", num=self.row + 1, format="HEX"
-            )[-1]
+            default_colors = Colors.golden_angle_color(
+                colormap="magma", num=max(10, self.row + 1), format="HEX"
+            )
+            default_color = default_colors[self.row]
             self.color_button.setColor(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
@@ -304,9 +304,10 @@ class DialogRow(QObject):
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
         else:
-            default_color = Colors.golden_angle_color(
-                colormap="magma", num=self.row + 1, format="HEX"
-            )[-1]
+            default_colors = Colors.golden_angle_color(
+                colormap="magma", num=max(10, self.row + 1), format="HEX"
+            )
+            default_color = default_colors[self.row]
             self.color_button.setColor(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)

bec_widgets/widgets/waveform/waveform_widget.py

@@ -28,6 +28,7 @@ except ImportError:
 
 
 class BECWaveformWidget(BECWidget, QWidget):
+    ICON_NAME = "show_chart"
     USER_ACCESS = [
         "curves",
         "plot",
@@ -105,7 +106,7 @@ class BECWaveformWidget(BECWidget, QWidget):
                 ),
                 "separator_2": SeparatorAction(),
                 "curves": MaterialIconAction(
-                    icon_name="stacked_line_chart", tooltip="Open Curves Configuration"
+                    icon_name="timeline", tooltip="Open Curves Configuration"
                 ),
                 "fit_params": MaterialIconAction(
                     icon_name="monitoring", tooltip="Open Fitting Parameters"
@@ -284,7 +285,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         y_entry: str | None = None,
         z_entry: str | None = None,
         color: str | None = None,
-        color_map_z: str | None = "plasma",
+        color_map_z: str | None = "magma",
         label: str | None = None,
         validate: bool = True,
         dap: str | None = None,  # TODO add dap custom curve wrapper