bec-widgets 0.100.0__py3-none-any.whl → 0.102.0__py3-none-any.whl

bec_widgets/widgets/lmfit_dialog/lmfit_dialog.py

@@ -0,0 +1,194 @@
+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 bec_widgets.utils import UILoader
+from bec_widgets.utils.bec_widget import BECWidget
+
+logger = bec_logger.logger
+
+
+class LMFitDialog(BECWidget, QWidget):
+    """Dialog for displaying the fit summary and params for LMFit DAP processes"""
+
+    ICON_NAME = "monitoring"
+    selected_fit = Signal(str)
+
+    def __init__(
+        self,
+        parent=None,
+        client=None,
+        config=None,
+        target_widget=None,
+        gui_id: str | None = None,
+        ui_file="lmfit_dialog_vertical.ui",
+    ):
+        """
+        Initialises the LMFitDialog widget.
+
+        Args:
+            parent (QWidget): The parent widget.
+            client: BEC client object.
+            config: Configuration of the widget.
+            target_widget: The widget that the settings will be taken from and applied to.
+            gui_id (str): GUI ID.
+            ui_file (str): The UI file to be loaded.
+        """
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QWidget.__init__(self, parent=parent)
+        self._ui_file = ui_file
+        self.target_widget = target_widget
+
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader(self).loader(os.path.join(current_path, self._ui_file))
+        self.layout = QVBoxLayout(self)
+        self.layout.addWidget(self.ui)
+        self.summary_data = {}
+        self._fit_curve_id = None
+        self._deci_precision = 3
+        self.ui.curve_list.currentItemChanged.connect(self.display_fit_details)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+    @Property(bool)
+    def hide_curve_selection(self):
+        """Property for showing the curve selection."""
+        return not self.ui.group_curve_selection.isVisible()
+
+    @hide_curve_selection.setter
+    def hide_curve_selection(self, show: bool):
+        """Setter for showing the curve selection.
+
+        Args:
+            show (bool): Whether to show the curve selection.
+        """
+        self.ui.group_curve_selection.setVisible(not show)
+
+    @property
+    def fit_curve_id(self):
+        """Property for the currently displayed fit curve_id."""
+        return self._fit_curve_id
+
+    @fit_curve_id.setter
+    def fit_curve_id(self, curve_id: str):
+        """Setter for the currently displayed fit curve_id.
+
+        Args:
+            fit_curve_id (str): The curve_id of the fit curve to be displayed.
+        """
+        self._fit_curve_id = curve_id
+        self.selected_fit.emit(curve_id)
+
+    @Slot(str)
+    def remove_dap_data(self, curve_id: str):
+        """Remove the DAP data for the given curve_id.
+
+        Args:
+            curve_id (str): The curve_id of the DAP data to be removed.
+        """
+        self.summary_data.pop(curve_id, None)
+        self.refresh_curve_list()
+
+    @Slot(str)
+    def select_curve(self, curve_id: str):
+        """Select active curve_id in the curve list.
+
+        Args:
+            curve_id (str): curve_id to be selected.
+        """
+        self.fit_curve_id = curve_id
+
+    @Slot(dict, dict)
+    def update_summary_tree(self, data: dict, metadata: dict):
+        """Update the summary tree with the given data.
+
+        Args:
+            data (dict): Data for the DAP Summary.
+            metadata (dict): Metadata of the fit curve.
+        """
+        curve_id = metadata.get("curve_id", "")
+        self.summary_data.update({curve_id: data})
+        self.refresh_curve_list()
+        if self.fit_curve_id is None:
+            self.fit_curve_id = curve_id
+        if curve_id != self.fit_curve_id:
+            return
+        if data is None:
+            return
+        self.ui.summary_tree.clear()
+        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}"),
+            ("Message", data.get("message", "")),
+        ]
+        for prop, val in properties:
+            QTreeWidgetItem(self.ui.summary_tree, [prop, val])
+        self.update_param_tree(data.get("params", []))
+
+    def _update_summary_data(self, curve_id: str, data: dict):
+        """Update the summary data with the given data.
+
+        Args:
+            curve_id (str): The curve_id of the fit curve.
+            data (dict): The data to be updated.
+        """
+        self.summary_data.update({curve_id: data})
+        if self.fit_curve_id is not None:
+            return
+        self.fit_curve_id = curve_id
+
+    def update_param_tree(self, params):
+        """Update the parameter tree with the given parameters.
+
+        Args:
+            params (list): List of LMFit parameters for the fit curve.
+        """
+        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])
+
+    def populate_curve_list(self):
+        """Populate the curve list with the available fit curves."""
+        for curve_name in self.summary_data.keys():
+            self.ui.curve_list.addItem(curve_name)
+
+    def refresh_curve_list(self):
+        """Refresh the curve list with the updated data."""
+        self.ui.curve_list.clear()
+        self.populate_curve_list()
+
+    def display_fit_details(self, current):
+        """Callback for displaying the fit details of the selected curve.
+
+        Args:
+            current: The current item in the curve list.
+        """
+        if current:
+            curve_name = current.text()
+            self.fit_curve_id = curve_name
+            data = self.summary_data[curve_name]
+            if data is None:
+                return
+            self.update_summary_tree(data, {"curve_id": curve_name})
+
+
+if __name__ == "__main__":
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    dialog = LMFitDialog()
+    dialog.show()
+    sys.exit(app.exec_())

bec_widgets/widgets/lmfit_dialog/lmfit_dialog_compact.ui

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>655</width>
+    <height>520</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Shape::VLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Shadow::Plain</enum>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="opaqueResize">
+      <bool>true</bool>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>true</bool>
+     </property>
+     <widget class="QGroupBox" name="group_curve_selection">
+      <property name="title">
+       <string>Select Curve</string>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QListWidget" name="curve_list"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QSplitter" name="splitter">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Orientation::Vertical</enum>
+      </property>
+      <widget class="QGroupBox" name="group_summary">
+       <property name="title">
+        <string>Fit Summary</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QTreeWidget" name="summary_tree">
+          <property name="uniformRowHeights">
+           <bool>false</bool>
+          </property>
+          <column>
+           <property name="text">
+            <string>Property</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Value</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QGroupBox" name="group_parameters">
+       <property name="title">
+        <string>Parameter Details</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QTreeWidget" name="param_tree">
+          <column>
+           <property name="text">
+            <string>Parameter</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Value</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Std</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/widgets/lmfit_dialog/lmfit_dialog_vertical.ui

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>274</width>
+    <height>568</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0">
+   <item>
+    <widget class="QGroupBox" name="group_curve_selection">
+     <property name="title">
+      <string>Select Curve</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout" stretch="3">
+      <item>
+       <widget class="QListWidget" name="curve_list"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="group_summary">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>250</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Fit Summary</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QTreeWidget" name="summary_tree">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="uniformRowHeights">
+         <bool>false</bool>
+        </property>
+        <attribute name="headerDefaultSectionSize">
+         <number>80</number>
+        </attribute>
+        <column>
+         <property name="text">
+          <string>Property</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Value</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="group_parameters">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>250</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Parameter Details</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QTreeWidget" name="param_tree">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <attribute name="headerDefaultSectionSize">
+         <number>80</number>
+        </attribute>
+        <column>
+         <property name="text">
+          <string>Parameter</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Value</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Std</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/widgets/lmfit_dialog/register_lm_fit_dialog.py

@@ -0,0 +1,15 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.lmfit_dialog.lm_fit_dialog_plugin import LMFitDialogPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(LMFitDialogPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

bec_widgets/widgets/stop_button/stop_button.py

@@ -23,16 +23,16 @@ class StopButton(BECWidget, QWidget):
         self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
 
         if toolbar:
-            icon = material_icon("stop", color="#cc181e", filled=True)
+            icon = material_icon("stop", color="#cc181e", filled=True, convert_to_pixmap=False)
             self.button = QToolButton(icon=icon)
-            self.button.triggered.connect(self.stop_scan)
+            self.button.setToolTip("Stop the scan queue")
         else:
             self.button = QPushButton()
             self.button.setText("Stop")
             self.button.setStyleSheet(
                 "background-color:  #cc181e; color: white; font-weight: bold; font-size: 12px;"
             )
-            self.button.clicked.connect(self.stop_scan)
+        self.button.clicked.connect(self.stop_scan)
 
         self.layout.addWidget(self.button)
 

bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py

@@ -4,66 +4,26 @@ from qtpy.QtWidgets import QDialog, QTreeWidgetItem, QVBoxLayout
 
 from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import UILoader
+from bec_widgets.widgets.lmfit_dialog.lmfit_dialog import LMFitDialog
 
 
 class FitSummaryWidget(QDialog):
+
     def __init__(self, parent=None, target_widget=None):
         super().__init__(parent=parent)
 
-        self.target_widget = target_widget
-        self.summary_data = self.target_widget.get_dap_summary()
-
         self.setModal(True)
-
-        current_path = os.path.dirname(__file__)
-        self.ui = UILoader(self).loader(os.path.join(current_path, "dap_summary.ui"))
+        self.target_widget = target_widget
+        self.dap_dialog = LMFitDialog(parent=self, ui_file="lmfit_dialog_compact.ui")
         self.layout = QVBoxLayout(self)
-        self.layout.addWidget(self.ui)
-
-        self.ui.curve_list.currentItemChanged.connect(self.display_fit_details)
-        self.ui.refresh_button.clicked.connect(self.refresh_dap)
-
-        self.populate_curve_list()
-
-    def populate_curve_list(self):
-        for curve_name in self.summary_data.keys():
-            self.ui.curve_list.addItem(curve_name)
-
-    def display_fit_details(self, current):
-        if current:
-            curve_name = current.text()
-            data = self.summary_data[curve_name]
-            if data is None:
-                return
-            self.refresh_trees(data)
-
-    @Slot()
-    def refresh_dap(self):
-        self.ui.curve_list.clear()
-        self.summary_data = self.target_widget.get_dap_summary()
-        self.populate_curve_list()
-
-    def refresh_trees(self, data):
-        self.update_summary_tree(data)
-        self.update_param_tree(data["params"])
-
-    def update_summary_tree(self, data):
-        self.ui.summary_tree.clear()
-        properties = [
-            ("Model", data.get("model", "")),
-            ("Method", data.get("method", "")),
-            ("Chi-Squared", str(data.get("chisqr", ""))),
-            ("Reduced Chi-Squared", str(data.get("redchi", ""))),
-            ("AIC", str(data.get("aic", ""))),
-            ("BIC", str(data.get("bic", ""))),
-            ("R-Squared", str(data.get("rsquared", ""))),
-            ("Message", data.get("message", "")),
-        ]
-        for prop, val in properties:
-            QTreeWidgetItem(self.ui.summary_tree, [prop, val])
-
-    def update_param_tree(self, params):
-        self.ui.param_tree.clear()
-        for param in params:
-            param_name, param_value, param_std = param[0], str(param[1]), str(param[7])
-            QTreeWidgetItem(self.ui.param_tree, [param_name, param_value, param_std])
+        self.layout.addWidget(self.dap_dialog)
+        self.target_widget.dap_summary_update.connect(self.dap_dialog.update_summary_tree)
+        self.setLayout(self.layout)
+        self._get_dap_from_target_widget()
+
+    def _get_dap_from_target_widget(self) -> None:
+        """Get the DAP data from the target widget and update the DAP dialog manually on creation."""
+        dap_summary = self.target_widget.get_dap_summary()
+        for curve_id, data in dap_summary.items():
+            md = {"curve_id": curve_id}
+            self.dap_dialog.update_summary_tree(data=data, metadata=md)

bec_widgets/widgets/waveform/waveform_widget.py

@@ -55,8 +55,8 @@ class BECWaveformWidget(BECWidget, QWidget):
     ]
     scan_signal_update = Signal()
     async_signal_update = Signal()
-    dap_params_update = Signal(dict)
-    dap_summary_update = Signal(dict)
+    dap_summary_update = Signal(dict, dict)
+    dap_params_update = Signal(dict, dict)
     autorange_signal = Signal()
     new_scan = Signal()
     crosshair_position_changed = Signal(tuple)
@@ -218,7 +218,7 @@ class BECWaveformWidget(BECWidget, QWidget):
     def show_fit_summary_dialog(self):
         dialog = FitSummaryWidget(target_widget=self)
         dialog.resize(800, 600)
-        dialog.show()
+        dialog.exec()
 
     ###################################
     # User Access Methods from Waveform
@@ -257,7 +257,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         """
         self.waveform.set_colormap(colormap)
 
-    @SafeSlot(popup_error=True)
+    @SafeSlot(str, popup_error=True)
     def set_x(self, x_name: str, x_entry: str | None = None):
         """
         Change the x axis of the plot widget.
@@ -272,7 +272,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         """
         self.waveform.set_x(x_name, x_entry)
 
-    @SafeSlot(popup_error=True)
+    @SafeSlot(str, popup_error=True)
     def plot(
         self,
         arg1: list | np.ndarray | str | None = None,
@@ -331,15 +331,16 @@ class BECWaveformWidget(BECWidget, QWidget):
             **kwargs,
         )
 
-    @SafeSlot(popup_error=True)
+    @SafeSlot(str, str, str, popup_error=True)
     def add_dap(
         self,
         x_name: str,
         y_name: str,
+        dap: str,
         x_entry: str | None = None,
         y_entry: str | None = None,
         color: str | None = None,
-        dap: str = "GaussianModel",
+        # dap: str = "GaussianModel",
         validate_bec: bool = True,
         **kwargs,
     ) -> BECCurve:

{bec_widgets-0.100.0.dist-info → bec_widgets-0.102.0.dist-info}/METADATA

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