bec-widgets 0.112.1__py3-none-any.whl → 0.114.0__py3-none-any.whl

bec_widgets/widgets/lmfit_dialog/lmfit_dialog.py

@@ -1,12 +1,12 @@
 import os
 
-from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtWidgets import QTreeWidgetItem, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QPushButton, QTreeWidgetItem, QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.colors import get_accent_colors
 
 logger = bec_logger.logger
 
@@ -15,7 +15,10 @@ class LMFitDialog(BECWidget, QWidget):
     """Dialog for displaying the fit summary and params for LMFit DAP processes"""
 
     ICON_NAME = "monitoring"
+    # Signal to emit the currently selected fit curve_id
     selected_fit = Signal(str)
+    # Signal to emit a move action in form of a tuple (param_name, value)
+    move_action = Signal(tuple)
 
     def __init__(
         self,
@@ -49,9 +52,54 @@ class LMFitDialog(BECWidget, QWidget):
         self.summary_data = {}
         self._fit_curve_id = None
         self._deci_precision = 3
+        self._always_show_latest = False
         self.ui.curve_list.currentItemChanged.connect(self.display_fit_details)
         self.layout.setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.layout)
+        self._active_actions = []
+        self._enable_actions = True
+        self._move_buttons = []
+        self._accent_colors = get_accent_colors()
+        self.action_buttons = {}
+
+    @property
+    def enable_actions(self) -> bool:
+        """Property to enable the move to buttons."""
+        return self._enable_actions
+
+    @enable_actions.setter
+    def enable_actions(self, enable: bool):
+        self._enable_actions = enable
+        for button in self.action_buttons.values():
+            button.setEnabled(enable)
+
+    @Property(list)
+    def active_action_list(self) -> list[str]:
+        """Property to list the names of the fit parameters for which actions should be enabled."""
+        return self._active_actions
+
+    @active_action_list.setter
+    def active_action_list(self, actions: list[str]):
+        self._active_actions = actions
+
+    # This slot needed?
+    @Slot(bool)
+    def set_actions_enabled(self, enable: bool) -> bool:
+        """Slot to enable the move to buttons.
+
+        Args:
+            enable (bool): Whether to enable the action buttons.
+        """
+        self.enable_actions = enable
+
+    @Property(bool)
+    def always_show_latest(self):
+        """Property to indicate if always the latest DAP update is displayed."""
+        return self._always_show_latest
+
+    @always_show_latest.setter
+    def always_show_latest(self, show: bool):
+        self._always_show_latest = show
 
     @Property(bool)
     def hide_curve_selection(self):
@@ -67,8 +115,36 @@ class LMFitDialog(BECWidget, QWidget):
         """
         self.ui.group_curve_selection.setVisible(not show)
 
+    @Property(bool)
+    def hide_summary(self) -> bool:
+        """Property for showing the summary."""
+        return not self.ui.group_summary.isVisible()
+
+    @hide_summary.setter
+    def hide_summary(self, show: bool):
+        """Setter for showing the summary.
+
+        Args:
+            show (bool): Whether to show the summary.
+        """
+        self.ui.group_summary.setVisible(not show)
+
+    @Property(bool)
+    def hide_parameters(self) -> bool:
+        """Property for showing the parameters."""
+        return not self.ui.group_parameters.isVisible()
+
+    @hide_parameters.setter
+    def hide_parameters(self, show: bool):
+        """Setter for showing the parameters.
+
+        Args:
+            show (bool): Whether to show the parameters.
+        """
+        self.ui.group_parameters.setVisible(not show)
+
     @property
-    def fit_curve_id(self):
+    def fit_curve_id(self) -> str:
         """Property for the currently displayed fit curve_id."""
         return self._fit_curve_id
 
@@ -112,19 +188,34 @@ class LMFitDialog(BECWidget, QWidget):
         curve_id = metadata.get("curve_id", "")
         self.summary_data.update({curve_id: data})
         self.refresh_curve_list()
-        if self.fit_curve_id is None:
+        if self.fit_curve_id is None or self.always_show_latest is True:
             self.fit_curve_id = curve_id
         if curve_id != self.fit_curve_id:
             return
         if data is None:
             return
         self.ui.summary_tree.clear()
+        chi_squared = data.get("chisqr", 0.0)
+        if isinstance(chi_squared, float) or isinstance(chi_squared, int):
+            chi_squared = f"{chi_squared:.{self._deci_precision}f}"
+        else:
+            chi_squared = "None"
+        reduced_chi_squared = data.get("redchi", 0.0)
+        if isinstance(reduced_chi_squared, float) or isinstance(reduced_chi_squared, int):
+            reduced_chi_squared = f"{reduced_chi_squared:.{self._deci_precision}f}"
+        else:
+            reduced_chi_squared = "None"
+        r_squared = data.get("rsquared", 0.0)
+        if isinstance(r_squared, float) or isinstance(r_squared, int):
+            r_squared = f"{r_squared:.{self._deci_precision}f}"
+        else:
+            r_squared = "None"
         properties = [
             ("Model", data.get("model", "")),
             ("Method", data.get("method", "")),
-            ("Chi-Squared", f"{data.get('chisqr', 0.0):.{self._deci_precision}f}"),
-            ("Reduced Chi-Squared", f"{data.get('redchi', 0.0):.{self._deci_precision}f}"),
-            ("R-Squared", f"{data.get('rsquared', 0.0):.{self._deci_precision}f}"),
+            ("Chi-Squared", chi_squared),
+            ("Reduced Chi-Squared", reduced_chi_squared),
+            ("R-Squared", r_squared),
             ("Message", data.get("message", "")),
         ]
         for prop, val in properties:
@@ -149,18 +240,62 @@ class LMFitDialog(BECWidget, QWidget):
         Args:
             params (list): List of LMFit parameters for the fit curve.
         """
+        self._move_buttons = []
         self.ui.param_tree.clear()
         for param in params:
-            param_name, param_value, param_std = (
-                param[0],
-                f"{param[1]:.{self._deci_precision}f}",
-                f"{param[7]:.{self._deci_precision}f}",
-            )
-            QTreeWidgetItem(self.ui.param_tree, [param_name, param_value, param_std])
+            param_name = param[0]
+            param_value = param[1]
+            if isinstance(param_value, float) or isinstance(param_value, int):
+                param_value = f"{param_value:.{self._deci_precision}f}"
+            else:
+                param_value = "None"
+            param_std = param[7]
+            if isinstance(param_std, float) or isinstance(param_std, int):
+                param_std = f"{param_std:.{self._deci_precision}f}"
+            else:
+                param_std = "None"
+
+            tree_item = QTreeWidgetItem(self.ui.param_tree, [param_name, param_value, param_std])
+            if param_name in self.active_action_list:  # pylint: disable=unsupported-membership-test
+                # Create a push button to move the motor to a specific position
+                widget = QWidget()
+                button = QPushButton(f"Move to {param_name}")
+                button.clicked.connect(self._create_move_action(param_name, param[1]))
+                if self.enable_actions is True:
+                    button.setEnabled(True)
+                else:
+                    button.setEnabled(False)
+                button.setStyleSheet(
+                    f"""
+                    QPushButton:enabled {{ background-color: {self._accent_colors.success.name()};color: white; }} 
+                    QPushButton:disabled {{ background-color: grey;color: white; }}
+                    """
+                )
+                self.action_buttons[param_name] = button
+                layout = QVBoxLayout()
+                layout.addWidget(self.action_buttons[param_name])
+                layout.setContentsMargins(0, 0, 0, 0)
+                widget.setLayout(layout)
+                self.ui.param_tree.setItemWidget(tree_item, 3, widget)
+
+    def _create_move_action(self, param_name: str, param_value: float) -> callable:
+        """Create a move action for the given parameter name and value.
+
+        Args:
+            param_name (str): The name of the parameter.
+            param_value (float): The value of the parameter.
+        Returns:
+            callable: The move action with the given parameter name and value.
+        """
+
+        def move_action():
+            self.move_action.emit((param_name, param_value))
+
+        return move_action
 
     def populate_curve_list(self):
         """Populate the curve list with the available fit curves."""
-        for curve_name in self.summary_data.keys():
+        for curve_name in self.summary_data:
             self.ui.curve_list.addItem(curve_name)
 
     def refresh_curve_list(self):
@@ -183,10 +318,10 @@ class LMFitDialog(BECWidget, QWidget):
             self.update_summary_tree(data, {"curve_id": curve_name})
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    from qtpy.QtWidgets import QApplication
+    from qtpy.QtWidgets import QApplication  # pylint: disable=ungrouped-imports
 
     app = QApplication(sys.argv)
     dialog = LMFitDialog()

bec_widgets/widgets/lmfit_dialog/lmfit_dialog_vertical.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>274</width>
-    <height>568</height>
+    <width>303</width>
+    <height>457</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,15 +19,40 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="1,2,2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="group_curve_selection">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Select Curve</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout" stretch="3">
       <item>
-       <widget class="QListWidget" name="curve_list"/>
+       <widget class="QListWidget" name="curve_list">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -35,15 +60,15 @@
    <item>
     <widget class="QGroupBox" name="group_summary">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
-       <width>250</width>
-       <height>200</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
      <property name="title">
@@ -53,7 +78,7 @@
       <item>
        <widget class="QTreeWidget" name="summary_tree">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -88,15 +113,15 @@
    <item>
     <widget class="QGroupBox" name="group_parameters">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
-       <width>250</width>
-       <height>200</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
      <property name="title">
@@ -106,7 +131,7 @@
       <item>
        <widget class="QTreeWidget" name="param_tree">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -117,8 +142,11 @@
           <height>0</height>
          </size>
         </property>
+        <property name="columnCount">
+         <number>4</number>
+        </property>
         <attribute name="headerDefaultSectionSize">
-         <number>80</number>
+         <number>70</number>
         </attribute>
         <column>
          <property name="text">
@@ -135,6 +163,11 @@
           <string>Std</string>
          </property>
         </column>
+        <column>
+         <property name="text">
+          <string>Action</string>
+         </property>
+        </column>
        </widget>
       </item>
      </layout>

bec_widgets/widgets/positioner_box/positioner_box.py

@@ -33,6 +33,8 @@ class PositionerBox(BECWidget, QWidget):
     ICON_NAME = "switch_right"
     USER_ACCESS = ["set_positioner"]
     device_changed = Signal(str, str)
+    # Signal emitted to inform listeners about a position update
+    position_update = Signal(float)
 
     def __init__(self, parent=None, device: Positioner = None, **kwargs):
         """Initialize the PositionerBox widget.
@@ -245,6 +247,7 @@ class PositionerBox(BECWidget, QWidget):
 
         if readback_val is not None:
             self.ui.readback.setText(f"{readback_val:.{precision}f}")
+            self.position_update.emit(readback_val)
 
         if setpoint_val is not None:
             self.ui.setpoint.setText(f"{setpoint_val:.{precision}f}")
@@ -318,7 +321,7 @@ class PositionerBox(BECWidget, QWidget):
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    from qtpy.QtWidgets import QApplication
+    from qtpy.QtWidgets import QApplication  # pylint: disable=ungrouped-imports
 
     app = QApplication(sys.argv)
     set_theme("dark")

bec_widgets/widgets/scan_control/scan_control.py

@@ -42,6 +42,7 @@ class ScanControl(BECWidget, QWidget):
 
     scan_started = Signal()
     scan_selected = Signal(str)
+    scan_axis = Signal(str, float, float)
 
     def __init__(
         self,
@@ -243,6 +244,44 @@ class ScanControl(BECWidget, QWidget):
         """
         self.current_scan = scan_name
 
+    @Property(bool)
+    def hide_arg_box(self):
+        """Property to hide the argument box."""
+        if self.arg_box is None:
+            return True
+        return not self.arg_box.isVisible()
+
+    @hide_arg_box.setter
+    def hide_arg_box(self, hide: bool):
+        """Setter for the hide_arg_box property.
+
+        Args:
+            hide(bool): Hide or show the argument box.
+        """
+        if self.arg_box is not None:
+            self.arg_box.setVisible(not hide)
+
+    @Property(bool)
+    def hide_kwarg_boxes(self):
+        """Property to hide the keyword argument boxes."""
+        if len(self.kwarg_boxes) == 0:
+            return True
+
+        for box in self.kwarg_boxes:
+            if box is not None:
+                return not box.isVisible()
+
+    @hide_kwarg_boxes.setter
+    def hide_kwarg_boxes(self, hide: bool):
+        """Setter for the hide_kwarg_boxes property.
+
+        Args:
+            hide(bool): Hide or show the keyword argument boxes.
+        """
+        if len(self.kwarg_boxes) > 0:
+            for box in self.kwarg_boxes:
+                box.setVisible(not hide)
+
     @Property(bool)
     def hide_scan_remember_toggle(self):
         """Property to hide the scan remember toggle."""
@@ -465,10 +504,12 @@ class ScanControl(BECWidget, QWidget):
     @SafeSlot(popup_error=True)
     def run_scan(self):
         """Starts the selected scan with the given parameters."""
-        self.scan_started.emit()
         args, kwargs = self.get_scan_parameters()
+        for device, start, stop in zip(*[iter(args)] * 3):
+            self.scan_axis.emit(device.name, start, stop)
         scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
         if callable(scan_function):
+            self.scan_started.emit()
             scan_function(*args, **kwargs)
 
     def cleanup(self):

bec_widgets/widgets/stop_button/stop_button.py

@@ -1,6 +1,6 @@
 from bec_qthemes import material_icon
 from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QPushButton, QSizePolicy, QToolButton, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.utils.bec_widget import BECWidget
@@ -28,9 +28,10 @@ class StopButton(BECWidget, QWidget):
             self.button.setToolTip("Stop the scan queue")
         else:
             self.button = QPushButton()
+            self.button.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
             self.button.setText("Stop")
             self.button.setStyleSheet(
-                "background-color:  #cc181e; color: white; font-weight: bold; font-size: 12px;"
+                f"background-color:  #cc181e; color: white; font-weight: bold; font-size: 12px;"
             )
         self.button.clicked.connect(self.stop_scan)
 
@@ -47,3 +48,14 @@ class StopButton(BECWidget, QWidget):
             scan_id(str|None): The scan id to stop. If None, the current scan will be stopped.
         """
         self.queue.request_scan_halt()
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    w = StopButton()
+    w.show()
+    sys.exit(app.exec_())

{bec_widgets-0.112.1.dist-info → bec_widgets-0.114.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.112.1
+Version: 0.114.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