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

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.101.0 (2024-09-02)
+
+### Feature
+
+* feat: add Dap dialog widget ([`9781b77`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9781b77de27b2810fbb1047a61b1832dd186db01))
+
+### Refactor
+
+* refactor: add docs, cleanup ([`61ecf49`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61ecf491e52bfbfa0d5a84764a9095310659043d))
+
 ## v0.100.0 (2024-09-01)
 
 ### Documentation
@@ -143,11 +153,3 @@
 ### Build
 
 * build: updated min version of bec qthemes ([`d482434`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d48243483ef8228cc5eb85e40a6b8f5da3b45520))
-
-### Fix
-
-* fix(cmaps): unified all defaults to magma cmap ([`1ca9499`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1ca9499edd334c19fe1e7aac71d3940a80a1ec95))
-
-* fix(color maps): color maps should take the background color into account; fixed min colors to 10 ([`060935f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/060935ffc5472a958c337bf60834c5291f104ece))
-
-## v0.99.2 (2024-08-27)

PKG-INFO

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

bec_widgets/cli/client.py

@@ -26,6 +26,7 @@ class Widgets(str, enum.Enum):
     DeviceBrowser = "DeviceBrowser"
     DeviceComboBox = "DeviceComboBox"
     DeviceLineEdit = "DeviceLineEdit"
+    LMFitDialog = "LMFitDialog"
     PositionerBox = "PositionerBox"
     PositionerControlLine = "PositionerControlLine"
     ResetButton = "ResetButton"
@@ -1811,6 +1812,15 @@ class BECWaveform(RPCBase):
             BECCurve: The curve object.
         """
 
+    @rpc_call
+    def get_dap_params(self) -> "dict":
+        """
+        Get the DAP parameters of all DAP curves.
+
+        Returns:
+            dict: DAP parameters of all DAP curves.
+        """
+
     @rpc_call
     def set_x(self, x_name: "str", x_entry: "str | None" = None):
         """
@@ -1825,15 +1835,6 @@ class BECWaveform(RPCBase):
             x_entry(str): Entry of the x signal.
         """
 
-    @rpc_call
-    def get_dap_params(self) -> "dict":
-        """
-        Get the DAP parameters of all DAP curves.
-
-        Returns:
-            dict: DAP parameters of all DAP curves.
-        """
-
     @rpc_call
     def remove_curve(self, *identifiers):
         """
@@ -2096,10 +2097,10 @@ class BECWaveformWidget(RPCBase):
         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",
         validate_bec: "bool" = True,
         **kwargs,
     ) -> "BECCurve":
@@ -2313,7 +2314,7 @@ class BECWaveformWidget(RPCBase):
 
 class DarkModeButton(RPCBase):
     @rpc_call
-    def toggle_dark_mode(self) -> None:
+    def toggle_dark_mode(self) -> "None":
         """
         Toggle the dark mode state. This will change the theme of the entire
         application to dark or light mode.
@@ -2392,6 +2393,24 @@ class DeviceLineEdit(RPCBase):
         """
 
 
+class LMFitDialog(RPCBase):
+    @property
+    @rpc_call
+    def _config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
+    @rpc_call
+    def _get_all_rpc(self) -> "dict":
+        """
+        Get all registered RPC objects.
+        """
+
+
 class PositionerBox(RPCBase):
     @rpc_call
     def set_positioner(self, positioner: "str | Positioner"):

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

@@ -49,8 +49,8 @@ class BECWaveform(BECPlotBase):
         "_config_dict",
         "plot",
         "add_dap",
-        "set_x",
         "get_dap_params",
+        "set_x",
         "remove_curve",
         "scan_history",
         "curves",
@@ -74,8 +74,8 @@ class BECWaveform(BECPlotBase):
     ]
     scan_signal_update = pyqtSignal()
     async_signal_update = pyqtSignal()
-    dap_params_update = pyqtSignal(dict)
-    dap_summary_update = pyqtSignal(dict)
+    dap_params_update = pyqtSignal(dict, dict)
+    dap_summary_update = pyqtSignal(dict, dict)
     autorange_signal = pyqtSignal()
     new_scan = pyqtSignal()
 
@@ -1085,8 +1085,9 @@ class BECWaveform(BECPlotBase):
                     curve.setData(x, y)
                     curve.dap_params = msg["data"][1]["fit_parameters"]
                     curve.dap_summary = msg["data"][1]["fit_summary"]
-                    self.dap_params_update.emit(curve.dap_params)
-                    self.dap_summary_update.emit(curve.dap_summary)
+                    metadata.update({"curve_id": curve_id_request})
+                    self.dap_params_update.emit(curve.dap_params, metadata)
+                    self.dap_summary_update.emit(curve.dap_summary, metadata)
                 break
 
     @Slot(dict, dict)

bec_widgets/widgets/lmfit_dialog/lm_fit_dialog.pyproject

@@ -0,0 +1 @@
+{'files': ['lmfit_dialog.py']}

bec_widgets/widgets/lmfit_dialog/lm_fit_dialog_plugin.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.lmfit_dialog.lmfit_dialog import LMFitDialog
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='LMFitDialog' name='lm_fit_dialog'>
+    </widget>
+</ui>
+"""
+
+
+class LMFitDialogPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = LMFitDialog(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Utils"
+
+    def icon(self):
+        return designer_material_icon(LMFitDialog.ICON_NAME)
+
+    def includeFile(self):
+        return "lm_fit_dialog"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "LMFitDialog"
+
+    def toolTip(self):
+        return "LMFitDialog"
+
+    def whatsThis(self):
+        return self.toolTip()

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/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.101.0.dist-info}/METADATA

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

{bec_widgets-0.100.0.dist-info → bec_widgets-0.101.0.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=HE_stq5wl-0wE5ZetfEmaaDbectk20jX7Z2cxwsBegg,8348
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=4klTHcSrZVAZ03F0WQ1nRQLwGgHsyFC3ZrYuz_X9HdE,6664
+CHANGELOG.md,sha256=6RUIXVV1FuM3_7TuNkxIHYQddeGb56Fx1mIlcTI29ss,6594
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=lYGRB6sUQh1tCnb-JCVMuNj2wLacFwAud4ub2-tQsOQ,1334
+PKG-INFO,sha256=Mikp7NvbMPYwdD8rtGYW_lMVdY0B8HmOsnlVF-fy5mA,1334
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=5WM5Q3BsITnjKAY0Cij4nOk6WK8lTHot7e3wQVWbRfc,2544
+pyproject.toml,sha256=D8jXP_3VO8qU5fKbBIS7LRgam7O3evOJvLkkPvanF3A,2544
 .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
@@ -22,7 +22,7 @@ bec_widgets/assets/status_icons/running.svg,sha256=nlc6rKh_f-uOxQSk0BkBNyWnPAJU5
 bec_widgets/assets/status_icons/warning.svg,sha256=CNx88p9kbDG51s9ztKf-cfYan4JdDBbk3-IFKfOOFlI,364
 bec_widgets/cli/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 bec_widgets/cli/auto_updates.py,sha256=DwzRChcFIWPH2kCYvp8H7dXvyYSKGYv6LwCmK2sDR2E,5676
-bec_widgets/cli/client.py,sha256=Go09tb7lnsDSljF-7rtWu4x8x_ooL-F4WWuu_yFaTNA,78098
+bec_widgets/cli/client.py,sha256=Sajhkf2hQJICfMSsB3nGLW5X2y50jwK2ICXxLSS4RXI,78465
 bec_widgets/cli/client_utils.py,sha256=l35LtTkD7PdvVCckjMU8-y6f5a5pp1u6cFPpD-Dkvow,11713
 bec_widgets/cli/generate_cli.py,sha256=Ea5px9KblUlcGg-1JbJBTIU7laGg2n8PM7Efw9WVVzM,5889
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
@@ -151,7 +151,7 @@ bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejM
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=wgARzsm98Y8SHPPwVp1LzNlXCxKEi6a8by8yYzIWsbY,18319
 bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=DE4cL1bSiSImaHLQPhc0dPVyj9hQRt7hr-aWO472OA0,51741
+bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=TDPtS4s0Kc-1KPidymxW1JPLwV77dqZHO316GYfzu08,51841
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=FlQFKm4r2xSrV9TSP0SWuD3lfAUO3COUHxMYz7Xxs5E,8653
 bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
@@ -160,6 +160,13 @@ bec_widgets/widgets/image/image_widget.py,sha256=8a4nR9JsPstIJSBrFiA1nkazTSmYuXa
 bec_widgets/widgets/image/register_bec_image_widget.py,sha256=01YLZQTMSSIXvH1TSL-1AYsRs1a4EbSwKLVAwh9AjeA,478
 bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=-e7HQOECeH5eDrJYh4BFIzRL78LDkooU4otabyN0aX4,2343
+bec_widgets/widgets/lmfit_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/lmfit_dialog/lm_fit_dialog.pyproject,sha256=PTvg1ddrW_R2_gd1cfA8UyxeVlgg5B-y71-F3lY6vKI,30
+bec_widgets/widgets/lmfit_dialog/lm_fit_dialog_plugin.py,sha256=X73Wn6tBkRSfhBEbg0ZZGIMCG6ujkidoJMXTQPuk2Y8,1267
+bec_widgets/widgets/lmfit_dialog/lmfit_dialog.py,sha256=0rUNECLs3S4hcqV115H87JQsqSWQLVb5S9iiCbG9PVs,6450
+bec_widgets/widgets/lmfit_dialog/lmfit_dialog_compact.ui,sha256=JbdMEPzbA3p2Ekz6U6NwXs1BqdBr71NUJNVOnhrN1dE,3397
+bec_widgets/widgets/lmfit_dialog/lmfit_dialog_vertical.ui,sha256=TS8FJSihTBShbx0QoXpCGAHEWVVwRxWsMazS8QxLrO4,4009
+bec_widgets/widgets/lmfit_dialog/register_lm_fit_dialog.py,sha256=a96eq_Lm_QtC0DAEcDrnF5PLj1LsDtxfNtmku7YPNw8,476
 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=jM-fxEfpkcyT1lNLvLDAntTcv_77KYWZC5Q4ykH0Y7I,1297
@@ -225,21 +232,20 @@ 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=qSQTeCzIUn8rgDkjIM47Rr3-fqg1uk8rDf_lCoY9gZw,1402
 bec_widgets/widgets/waveform/register_bec_waveform_widget.py,sha256=qZHVZH_lP2hvzkG1Ra0EyrXlMeLkRCy0aceH-bfJ1cs,490
-bec_widgets/widgets/waveform/waveform_widget.py,sha256=QBGv0qLP7FPc8uT3KF6_js2cOcgcdI_SHfqMri77U1s,22170
+bec_widgets/widgets/waveform/waveform_widget.py,sha256=PCkJMPVtmdCTaa2PucDM91vDyW49xta04Ri5oFhTOi4,22227
 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=ApWv0n33TJBP59CQ4MUdyPRSiKfXjTdfui1IfwzFNjE,13172
 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=UptWjHRVp7gTAMkWikfia3U6k8EV_pAvk-fI_vhWd2w,2437
+bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=XOHppMcONwfhAYpqIc51VOrpunWmPSn50sT3I0MjW2c,1173
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEAiDjaUS_l7JroYVdsotnLpD9H0,476
 bec_widgets/widgets/website/website.py,sha256=kDlqjwtx0yft1ZNRhTdHnYh_5KZHfqT_ZGPOKT4C-yI,2619
 bec_widgets/widgets/website/website_widget.pyproject,sha256=scOiV3cV1_BjbzpPzy2N8rIJL5P2qIZz8ObTJ-Uvdtg,25
 bec_widgets/widgets/website/website_widget_plugin.py,sha256=pz38_C2cZ0yvPPS02wdIPcmhFo_yiwUhflsASocAPQQ,1341
-bec_widgets-0.100.0.dist-info/METADATA,sha256=lYGRB6sUQh1tCnb-JCVMuNj2wLacFwAud4ub2-tQsOQ,1334
-bec_widgets-0.100.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.100.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.100.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.100.0.dist-info/RECORD,,
+bec_widgets-0.101.0.dist-info/METADATA,sha256=Mikp7NvbMPYwdD8rtGYW_lMVdY0B8HmOsnlVF-fy5mA,1334
+bec_widgets-0.101.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.101.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.101.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.101.0.dist-info/RECORD,,

pyproject.toml

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

bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary.ui

@@ -1,127 +0,0 @@
-<?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>800</width>
-                <height>600</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="QPushButton" name="refresh_button">
-                                    <property name="text">
-                                        <string>Refresh DAP Summary</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <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>