bec-widgets 0.99.13__tar.gz → 0.99.15__tar.gz

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v0.99.15 (2024-08-31)
+
+### Fix
+
+* fix(theme): update pg axes on theme update ([`af23e74`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af23e74f71152f4abc319ab7b45e65deefde3519))
+
+* fix(positioner_box): fixed positioner box dialog; added test; closes #332 ([`0bf1cf9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0bf1cf9b8ab2f9171d5ff63d4e3672eb93e9a5fa))
+
+## v0.99.14 (2024-08-30)
+
+### Fix
+
+* fix(color_button): signal and slot added for selecting color and for emitting color after change ([`99a98de`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99a98de8a3b7a83d71e4b567e865ac6f5c62a754))
+
+* fix(color_button): inheritance changed to QWidget ([`3c0e501`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3c0e501c56227d4d98ff0ac2186ff5065bff8d7a))
+
 ## v0.99.13 (2024-08-30)
 
 ### Documentation
@@ -139,23 +155,3 @@ If not theme is set, the init of the BECWidget base class sets the default theme
 * fix(crosshair): emit all crosshair events, not just line coordinates ([`2265458`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2265458dcc57970db18c62619f5877d542d72e81))
 
 ## v0.99.0 (2024-08-25)
-
-### Documentation
-
-* docs(darkmodebutton): added dark mode button docs ([`406c263`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/406c263746f0e809c1a4d98356c48f40428c23d7))
-
-### Feature
-
-* feat(darkmodebutton): added button to toggle between dark and light mode ([`cc8c166`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc8c166b5c1d37e0f64c83801b2347a54a6550b6))
-
-### Fix
-
-* fix(toggle): emit state change ([`c4f3308`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c4f3308dc0c3e4b2064760ccd7372d71b3e49f96))
-
-### Refactor
-
-* refactor(darkmodebutton): renamed set_dark_mode_enabled to toggle_dark_mode ([`c70724a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c70724a456900bcb06b040407a2c5d497e49ce77))
-
-### Test
-
-* test(dark_mode_button): added tests for dark mode button ([`df35aab`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df35aabff30c5d00b1c441132bd370446653741e))

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.99.13
+Version: 0.99.15
 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.99.13 → bec_widgets-0.99.15}/bec_widgets/utils/colors.py

@@ -29,6 +29,7 @@ def set_theme(theme: Literal["dark", "light", "auto"]):
     app = QApplication.instance()
     bec_qthemes.setup_theme(theme)
     pg.setConfigOption("background", "w" if app.theme["theme"] == "light" else "k")
+    app.theme_signal.theme_updated.emit(theme)
     apply_theme(theme)
 
     # pylint: disable=protected-access
@@ -37,6 +38,7 @@ def set_theme(theme: Literal["dark", "light", "auto"]):
 
     def callback():
         app.theme["theme"] = listener._theme.lower()
+        app.theme_signal.theme_updated.emit(app.theme["theme"])
         apply_theme(listener._theme.lower())
 
     listener = OSThemeSwitchListener(callback)
@@ -53,6 +55,7 @@ def apply_theme(theme: Literal["dark", "light"]):
     children = itertools.chain.from_iterable(
         top.findChildren(pg.GraphicsLayoutWidget) for top in app.topLevelWidgets()
     )
+    pg.setConfigOptions(foreground="d" if theme == "dark" else "k")
     for pg_widget in children:
         pg_widget.setBackground("k" if theme == "dark" else "w")
 

bec_widgets-0.99.15/bec_widgets/widgets/color_button/color_button.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+from typing import Literal
+
+import pyqtgraph as pg
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtWidgets import QHBoxLayout, QWidget
+
+from bec_widgets.qt_utils.error_popups import SafeSlot
+
+
+class ColorButton(QWidget):
+    """
+    A ColorButton that opens a dialog to select a color. Inherits from pyqtgraph.ColorButton.
+    Patches event loop of the ColorDialog, if opened in another QDialog.
+    """
+
+    color_selected = Signal(str)
+
+    ICON_NAME = "colors"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.layout = QHBoxLayout(self)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
+
+        self.button = pg.ColorButton()
+        self.button.setFlat(True)
+        self.button.clicked.connect(self.select_color)
+        self.layout.addWidget(self.button)
+
+    @SafeSlot()
+    def select_color(self):
+        self.origColor = self.button.color()
+        self.button.colorDialog.setCurrentColor(self.button.color())
+        self.button.colorDialog.open()
+        self.button.colorDialog.exec()
+        self.color_selected.emit(self.button.color().name())
+
+    @SafeSlot(str)
+    def set_color(self, color: tuple | str):
+        """
+        Set the color of the button.
+
+        Args:
+            color(tuple|str): The color to set.
+        """
+        self.button.setColor(color)
+
+    def get_color(self, format: Literal["RGBA", "HEX"] = "RGBA") -> tuple | str:
+        """
+        Get the color of the button in the specified format.
+
+        Args:
+            format(Literal["RGBA", "HEX"]): The format of the returned color.
+
+        Returns:
+            tuple|str: The color in the specified format.
+        """
+        if format == "RGBA":
+            return self.button.color().getRgb()
+        if format == "HEX":
+            return self.button.color().name()
+
+    def cleanup(self):
+        """
+        Clean up the ColorButton.
+        """
+        self.button.colorDialog.close()
+        self.button.colorDialog.deleteLater()

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/bec_widgets/widgets/figure/plots/plot_base.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 from typing import Literal, Optional
 
+import bec_qthemes
 import pyqtgraph as pg
 from pydantic import BaseModel, Field
 from qtpy.QtCore import Signal, Slot
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QApplication, QWidget
 
 from bec_widgets.utils import BECConnector, ConnectionConfig
 from bec_widgets.utils.crosshair import Crosshair
@@ -98,6 +99,36 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
 
         self.add_legend()
         self.crosshair = None
+        self.connect_to_theme_change()
+        self.apply_theme()
+
+    def connect_to_theme_change(self):
+        """Connect to the theme change signal."""
+        qapp = QApplication.instance()
+        if hasattr(qapp, "theme_signal"):
+            qapp.theme_signal.theme_updated.connect(self.apply_theme)
+
+    @Slot(str)
+    @Slot()
+    def apply_theme(self, theme: str | None = None):
+        """
+        Apply the theme to the plot widget.
+
+        Args:
+            theme(str, optional): The theme to be applied.
+        """
+        if theme is None:
+            qapp = QApplication.instance()
+            if hasattr(qapp, "theme"):
+                theme = qapp.theme["theme"]
+            else:
+                theme = "dark"
+        palette = bec_qthemes.load_palette(theme)
+        text_pen = pg.mkPen(color=palette.text().color())
+
+        for axis in ["left", "bottom", "right", "top"]:
+            self.plot_item.getAxis(axis).setPen(text_pen)
+            self.plot_item.getAxis(axis).setTextPen(text_pen)
 
     def set(self, **kwargs) -> None:
         """

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -27,7 +27,7 @@ class MotorMapSettings(SettingWidget):
         background_intensity = int((config["background_value"] / 255) * 100)
         WidgetIO.set_value(self.ui.background_value, background_intensity)
         color = config["color"]
-        self.ui.color.setColor(color)
+        self.ui.color.set_color(color)
 
     @Slot()
     def accept_changes(self):

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/bec_widgets/widgets/positioner_box/positioner_box.py

@@ -46,6 +46,7 @@ class PositionerBox(BECWidget, QWidget):
         self.get_bec_shortcuts()
         self._device = ""
         self._limits = None
+        self._dialog = None
 
         self.init_ui()
 
@@ -87,17 +88,18 @@ class PositionerBox(BECWidget, QWidget):
 
     def _open_dialog_selection(self):
         """Open dialog window for positioner selection"""
-        dialog = QDialog(self)
-        dialog.setWindowTitle("Positioner Selection")
+        self._dialog = QDialog(self)
+        self._dialog.setWindowTitle("Positioner Selection")
         layout = QVBoxLayout()
         line_edit = DeviceLineEdit(self, client=self.client, device_filter="Positioner")
-        line_edit.textChanged.connect(self._positioner_changed)
+        line_edit.textChanged.connect(self.set_positioner)
         layout.addWidget(line_edit)
         close_button = QPushButton("Close")
-        close_button.clicked.connect(dialog.accept)
+        close_button.clicked.connect(self._dialog.accept)
         layout.addWidget(close_button)
-        dialog.setLayout(layout)
-        dialog.exec()
+        self._dialog.setLayout(layout)
+        self._dialog.exec()
+        self._dialog = None
 
     def init_device(self):
         """Init the device view and readback"""

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -123,7 +123,7 @@ class CurveSettings(SettingWidget):
         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 in range(rows):
-            table.cellWidget(row, color_button_col).setColor(colors[row])
+            table.cellWidget(row, color_button_col).set_color(colors[row])
 
     @Slot()
     def accept_changes(self):
@@ -275,7 +275,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.color_button.setColor(self.config.color)
+            self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
@@ -284,7 +284,7 @@ class DialogRow(QObject):
                 colormap="magma", num=max(10, self.row + 1), format="HEX"
             )
             default_color = default_colors[self.row]
-            self.color_button.setColor(default_color)
+            self.color_button.set_color(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)
@@ -299,7 +299,7 @@ class DialogRow(QObject):
             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.color_button.setColor(self.config.color)
+            self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
@@ -308,7 +308,7 @@ class DialogRow(QObject):
                 colormap="magma", num=max(10, self.row + 1), format="HEX"
             )
             default_color = default_colors[self.row]
-            self.color_button.setColor(default_color)
+            self.color_button.set_color(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)

{bec_widgets-0.99.13 → bec_widgets-0.99.15}/pyproject.toml

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

bec_widgets-0.99.13/bec_widgets/widgets/color_button/color_button.py

@@ -1,45 +0,0 @@
-from __future__ import annotations
-
-from typing import Literal
-
-import pyqtgraph as pg
-
-
-class ColorButton(pg.ColorButton):
-    """
-    A ColorButton that opens a dialog to select a color. Inherits from pyqtgraph.ColorButton.
-    Patches event loop of the ColorDialog, if opened in another QDialog.
-    """
-
-    ICON_NAME = "colors"
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def selectColor(self):
-        self.origColor = self.color()
-        self.colorDialog.setCurrentColor(self.color())
-        self.colorDialog.open()
-        self.colorDialog.exec()
-
-    def get_color(self, format: Literal["RGBA", "HEX"] = "RGBA") -> tuple | str:
-        """
-        Get the color of the button in the specified format.
-
-        Args:
-            format(Literal["RGBA", "HEX"]): The format of the returned color.
-
-        Returns:
-            tuple|str: The color in the specified format.
-        """
-        if format == "RGBA":
-            return self.color().getRgb()
-        if format == "HEX":
-            return self.color().name()
-
-    def cleanup(self):
-        """
-        Clean up the ColorButton.
-        """
-        self.colorDialog.close()
-        self.colorDialog.deleteLater()