bec-widgets 0.105.0__tar.gz → 0.107.0__tar.gz

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/CHANGELOG.md

@@ -1,5 +1,37 @@
 # CHANGELOG
 
+## v0.107.0 (2024-09-06)
+
+### Documentation
+
+* docs: extend waveform docs ([`e6976dc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e6976dc15105209852090a00a97b7cda723142e9))
+
+### Feature
+
+* feat: add roi select for dap, allow automatic clear curves on plot request ([`7bdca84`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7bdca8431496fe6562d2c28f5a6af869d1a2e654))
+
+### Refactor
+
+* refactor: change style to bec_accent_colors ([`bd126dd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bd126dddbbec3e6c448cce263433d328d577c5c0))
+
+### Test
+
+* test: add tests, including extension to end-2-end test ([`b1aff6d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b1aff6d791ff847eb2f628e66ccaa4672fdeea08))
+
+## v0.106.0 (2024-09-05)
+
+### Feature
+
+* feat(plot_base): toggle to switch outer axes for plotting widgets ([`06d7741`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06d7741622aea8556208cd17cae521c37333f8b6))
+
+### Refactor
+
+* refactor: use DAPComboBox in curve_dialog selection ([`998a745`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/998a7451335b1b35c3e18691d3bab8d882e2d30b))
+
+### Test
+
+* test: fix tests ([`6b15abc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b15abcc73170cb49292741a619a08ee615e6250))
+
 ## v0.105.0 (2024-09-04)
 
 ### Feature
@@ -126,32 +158,6 @@
 
 ## v0.99.13 (2024-08-30)
 
-### Documentation
-
-* docs: minor updates to the widget tutorial ([`ec9c8f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ec9c8f29633364c45ebd998a5411d428c1ce488d))
-
-* docs(widget tutorial): step by step guide added ([`b32ced8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b32ced85fff628a9e1303a781630cdae3865238e))
-
 ### Fix
 
 * fix(dark mode button): fixed dark mode button state for external updates, including auto ([`a3110d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3110d98147295dcb1f9353f9aaf5461cba9232a))
-
-## v0.99.12 (2024-08-29)
-
-### Fix
-
-* fix(toolbar): widget action added ([`2efd487`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2efd48736cbe04e84533f7933c552ea8274e2162))
-
-* fix(reset_button): reset button added ([`6ed1efc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ed1efc6af193908f70aa37fb73157d2ca6a62f4))
-
-* fix(abort_button): abort button added; some minor fixes ([`a568633`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a568633c3206a8c26069d140f2d9a548bf4124b0))
-
-## v0.99.11 (2024-08-29)
-
-### Fix
-
-* fix(resume_button): resume button added ([`8be8295`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8be8295b2b38f36da210ab36c5da6d0a00e330cc))
-
-### Refactor
-
-* refactor(icons): general app icon changed; jupyter app icon changed to material icon ([`5d73fe4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d73fe455a568ad40a9fadc5ce6e249d782ad20d))

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.105.0
+Version: 0.107.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.105.0 → bec_widgets-0.107.0}/bec_widgets/cli/client.py

@@ -1653,6 +1653,15 @@ class BECPlotBase(RPCBase):
             y(bool): Show grid on the y-axis.
         """
 
+    @rpc_call
+    def set_outer_axes(self, show: "bool" = True):
+        """
+        Set the outer axes of the plot widget.
+
+        Args:
+            show(bool): Show the outer axes.
+        """
+
     @rpc_call
     def lock_aspect_ratio(self, lock):
         """
@@ -1878,7 +1887,7 @@ class BECWaveform(RPCBase):
         """
 
     @rpc_call
-    def get_all_data(self, output: "Literal['dict', 'pandas']" = "dict") -> "dict | pd.DataFrame":
+    def get_all_data(self, output: "Literal['dict', 'pandas']" = "dict") -> "dict":
         """
         Extract all curve data into a dictionary or a pandas DataFrame.
 
@@ -2041,6 +2050,25 @@ class BECWaveform(RPCBase):
             size(int): Font size of the legend.
         """
 
+    @rpc_call
+    def toggle_roi(self, toggled: "bool") -> "None":
+        """
+        Toggle the linear region selector on the plot.
+
+        Args:
+            toggled(bool): If True, enable the linear region selector.
+        """
+
+    @rpc_call
+    def select_roi(self, region: "tuple[float, float]"):
+        """
+        Set the fit region of the plot widget. At the moment only a single region is supported.
+        To remove the roi region again, use toggle_roi_region
+
+        Args:
+            region(tuple[float, float]): The fit region.
+        """
+
 
 class BECWaveformWidget(RPCBase):
     @property
@@ -2312,12 +2340,30 @@ class BECWaveformWidget(RPCBase):
         Export the plot widget to Matplotlib.
         """
 
+    @rpc_call
+    def toggle_roi(self, checked: "bool"):
+        """
+        Toggle the linear region selector.
+
+        Args:
+            checked(bool): If True, enable the linear region selector.
+        """
+
+    @rpc_call
+    def select_roi(self, region: "tuple"):
+        """
+        Set the region of interest of the plot widget.
+
+        Args:
+            region(tuple): Region of interest.
+        """
+
 
 class DapComboBox(RPCBase):
     @rpc_call
     def select_y_axis(self, y_axis: str):
         """
-        Receive update signal for the y axis.
+        Slot to update the y axis.
 
         Args:
             y_axis(str): Y axis.
@@ -2326,19 +2372,19 @@ class DapComboBox(RPCBase):
     @rpc_call
     def select_x_axis(self, x_axis: str):
         """
-        Receive update signal for the x axis.
+        Slot to update the x axis.
 
         Args:
             x_axis(str): X axis.
         """
 
     @rpc_call
-    def select_fit(self, fit_name: str | None):
+    def select_fit_model(self, fit_name: str | None):
         """
-        Select current fit.
+        Slot to update the fit model.
 
-         Args:
-             default_device(str): Default device name.
+        Args:
+            default_device(str): Default device name.
         """
 
 

bec_widgets-0.107.0/bec_widgets/utils/linear_region_selector.py

@@ -0,0 +1,72 @@
+""" Module for a thin wrapper (LinearRegionWrapper) around the LinearRegionItem in pyqtgraph.
+The class is mainly designed for usage with the BECWaveform and 1D plots. """
+
+import pyqtgraph as pg
+from qtpy.QtCore import QObject, Signal, Slot
+from qtpy.QtGui import QColor
+
+
+class LinearRegionWrapper(QObject):
+    """Wrapper class for the LinearRegionItem in pyqtgraph for 1D plots (BECWaveform)
+
+    Args:
+        plot_item (pg.PlotItem): The plot item to add the region selector to.
+        parent (QObject): The parent object.
+        color (QColor): The color of the region selector.
+        hover_color (QColor): The color of the region selector when the mouse is over it.
+    """
+
+    # Signal with the region tuble (start, end)
+    region_changed = Signal(tuple)
+
+    def __init__(
+        self, plot_item: pg.PlotItem, color: QColor = None, hover_color: QColor = None, parent=None
+    ):
+        super().__init__(parent)
+        self._edge_width = 2
+        self.plot_item = plot_item
+        self.linear_region_selector = pg.LinearRegionItem()
+        self.proxy = None
+        self.change_roi_color((color, hover_color))
+
+    # Slot for changing the color of the region selector (edge and fill)
+    @Slot(tuple)
+    def change_roi_color(self, colors: tuple[QColor | str | tuple, QColor | str | tuple]):
+        """Change the color and hover color of the region selector.
+        Hover color means the color when the mouse is over the region.
+
+        Args:
+            colors (tuple): Tuple with the color and hover color
+        """
+        color, hover_color = colors
+        if color is not None:
+            self.linear_region_selector.setBrush(pg.mkBrush(color))
+        if hover_color is not None:
+            self.linear_region_selector.setHoverBrush(pg.mkBrush(hover_color))
+
+    @Slot()
+    def add_region_selector(self):
+        """Add the region selector to the plot item"""
+        self.plot_item.addItem(self.linear_region_selector)
+        # Use proxy to limit the update rate of the region change signal to 10Hz
+        self.proxy = pg.SignalProxy(
+            self.linear_region_selector.sigRegionChanged,
+            rateLimit=10,
+            slot=self._region_change_proxy,
+        )
+
+    @Slot()
+    def remove_region_selector(self):
+        """Remove the region selector from the plot item"""
+        self.proxy.disconnect()
+        self.proxy = None
+        self.plot_item.removeItem(self.linear_region_selector)
+
+    def _region_change_proxy(self):
+        """Emit the region change signal"""
+        region = self.linear_region_selector.getRegion()
+        self.region_changed.emit(region)
+
+    def cleanup(self):
+        """Cleanup the widget."""
+        self.remove_region_selector()

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/bec_widgets/widgets/figure/plots/axis_settings.py

@@ -31,6 +31,7 @@ class AxisSettings(SettingWidget):
 
         # Top Box
         WidgetIO.set_value(self.ui.plot_title, axis_config["title"])
+        self.ui.switch_outer_axes.checked = axis_config["outer_axes"]
 
         # X Axis Box
         WidgetIO.set_value(self.ui.x_label, axis_config["x_label"])
@@ -63,6 +64,7 @@ class AxisSettings(SettingWidget):
     @Slot()
     def accept_changes(self):
         title = WidgetIO.get_value(self.ui.plot_title)
+        outer_axes = self.ui.switch_outer_axes.checked
 
         # X Axis
         x_label = WidgetIO.get_value(self.ui.x_label)
@@ -86,3 +88,4 @@ class AxisSettings(SettingWidget):
             y_lim=y_lim,
         )
         self.target_widget.set_grid(x_grid, y_grid)
+        self.target_widget.set_outer_axes(outer_axes)

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/bec_widgets/widgets/figure/plots/axis_settings.ui

@@ -6,8 +6,8 @@
             <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>417</width>
-                <height>250</height>
+                <width>427</width>
+                <height>270</height>
             </rect>
         </property>
         <property name="minimumSize">
@@ -26,7 +26,28 @@
             <string>Form</string>
         </property>
         <layout class="QGridLayout" name="gridLayout">
-            <item row="1" column="1">
+            <item row="0" column="0" colspan="2">
+                <layout class="QHBoxLayout" name="horizontalLayout">
+                    <item>
+                        <widget class="QLabel" name="plot_title_label">
+                            <property name="text">
+                                <string>Plot Title</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item>
+                        <widget class="QLineEdit" name="plot_title"/>
+                    </item>
+                </layout>
+            </item>
+            <item row="1" column="0">
+                <widget class="QLabel" name="label_outer_axes">
+                    <property name="text">
+                        <string>Outer Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="2" column="1">
                 <widget class="QGroupBox" name="y_axis_box">
                     <property name="title">
                         <string>Y Axis</string>
@@ -120,7 +141,7 @@
                     </layout>
                 </widget>
             </item>
-            <item row="1" column="0">
+            <item row="2" column="0">
                 <widget class="QGroupBox" name="x_axis_box">
                     <property name="title">
                         <string>X Axis</string>
@@ -214,22 +235,22 @@
                     </layout>
                 </widget>
             </item>
-            <item row="0" column="0" colspan="2">
-                <layout class="QHBoxLayout" name="horizontalLayout">
-                    <item>
-                        <widget class="QLabel" name="plot_title_label">
-                            <property name="text">
-                                <string>Plot Title</string>
-                            </property>
-                        </widget>
-                    </item>
-                    <item>
-                        <widget class="QLineEdit" name="plot_title"/>
-                    </item>
-                </layout>
+            <item row="1" column="1">
+                <widget class="ToggleSwitch" name="switch_outer_axes">
+                    <property name="checked" stdset="0">
+                        <bool>false</bool>
+                    </property>
+                </widget>
             </item>
         </layout>
     </widget>
+    <customwidgets>
+        <customwidget>
+            <class>ToggleSwitch</class>
+            <extends>QWidget</extends>
+            <header>toggle_switch</header>
+        </customwidget>
+    </customwidgets>
     <resources/>
     <connections/>
 </ui>

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/bec_widgets/widgets/figure/plots/plot_base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections import defaultdict
 from typing import Literal, Optional
 
 import bec_qthemes
@@ -31,6 +32,7 @@ class AxisConfig(BaseModel):
     y_lim: Optional[tuple] = Field(None, description="The limits of the y-axis.")
     x_grid: bool = Field(False, description="Show grid on the x-axis.")
     y_grid: bool = Field(False, description="Show grid on the y-axis.")
+    outer_axes: bool = Field(False, description="Show the outer axes of the plot widget.")
     model_config: dict = {"validate_assignment": True}
 
 
@@ -75,6 +77,7 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         "set_x_lim",
         "set_y_lim",
         "set_grid",
+        "set_outer_axes",
         "lock_aspect_ratio",
         "export",
         "remove",
@@ -336,6 +339,17 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         self.config.axis.x_grid = x
         self.config.axis.y_grid = y
 
+    def set_outer_axes(self, show: bool = True):
+        """
+        Set the outer axes of the plot widget.
+
+        Args:
+            show(bool): Show the outer axes.
+        """
+        self.plot_item.showAxis("top", show)
+        self.plot_item.showAxis("right", show)
+        self.config.axis.outer_axes = show
+
     def add_legend(self):
         """Add legend to the plot"""
         self.plot_item.addLegend()

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -12,10 +12,11 @@ from bec_lib.logger import bec_logger
 from pydantic import Field, ValidationError, field_validator
 from pyqtgraph.exporters import MatplotlibExporter
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QApplication, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
+from bec_widgets.utils.linear_region_selector import LinearRegionWrapper
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
     BECCurve,
@@ -74,6 +75,8 @@ class BECWaveform(BECPlotBase):
         "remove",
         "clear_all",
         "set_legend_label_size",
+        "toggle_roi",
+        "select_roi",
     ]
     scan_signal_update = pyqtSignal()
     async_signal_update = pyqtSignal()
@@ -81,6 +84,9 @@ class BECWaveform(BECPlotBase):
     dap_summary_update = pyqtSignal(dict, dict)
     autorange_signal = pyqtSignal()
     new_scan = pyqtSignal()
+    roi_changed = pyqtSignal(tuple)
+    roi_active = pyqtSignal(bool)
+    request_dap_refresh = pyqtSignal()
 
     def __init__(
         self,
@@ -100,6 +106,9 @@ class BECWaveform(BECPlotBase):
         self.old_scan_id = None
         self.scan_id = None
         self.scan_item = None
+        self._roi_region = None
+        self.roi_select = None
+        self._accent_colors = QApplication.instance().theme.accent_colors
         self._x_axis_mode = {
             "name": None,
             "entry": None,
@@ -130,6 +139,63 @@ class BECWaveform(BECPlotBase):
         self.add_legend()
         self.apply_config(self.config)
 
+    @Slot(bool)
+    def toggle_roi(self, toggled: bool) -> None:
+        """Toggle the linear region selector on the plot.
+
+        Args:
+            toggled(bool): If True, enable the linear region selector.
+        """
+        if toggled:
+            return self._hook_roi()
+        return self._unhook_roi()
+
+    @Slot(tuple)
+    def select_roi(self, region: tuple[float, float]):
+        """Set the fit region of the plot widget. At the moment only a single region is supported.
+        To remove the roi region again, use toggle_roi_region
+
+        Args:
+            region(tuple[float, float]): The fit region.
+        """
+        if self.roi_region == (None, None):
+            self.toggle_roi(True)
+        try:
+            self.roi_select.linear_region_selector.setRegion(region)
+        except Exception as e:
+            logger.error(f"Error setting region {tuple}; Exception raised: {e}")
+            raise ValueError(f"Error setting region {tuple}; Exception raised: {e}")
+
+    def _hook_roi(self):
+        """Hook the linear region selector to the plot."""
+        color = self._accent_colors.default
+        color.setAlpha(int(0.2 * 255))
+        hover_color = self._accent_colors.default
+        hover_color.setAlpha(int(0.35 * 255))
+        if self.roi_select is None:
+            self.roi_select = LinearRegionWrapper(
+                self.plot_item, color=color, hover_color=hover_color, parent=self
+            )
+            self.roi_select.add_region_selector()
+            self.roi_select.region_changed.connect(self.roi_changed)
+            self.roi_select.region_changed.connect(self.set_roi_region)
+            self.request_dap_refresh.connect(self.refresh_dap)
+            self._emit_roi_region()
+            self.roi_active.emit(True)
+
+    def _unhook_roi(self):
+        """Unhook the linear region selector from the plot."""
+        if self.roi_select is not None:
+            self.roi_select.region_changed.disconnect(self.roi_changed)
+            self.roi_select.region_changed.disconnect(self.set_roi_region)
+            self.request_dap_refresh.disconnect(self.refresh_dap)
+            self.roi_active.emit(False)
+            self.roi_region = None
+            self.refresh_dap()
+            self.roi_select.cleanup()
+            self.roi_select.deleteLater()
+            self.roi_select = None
+
     def apply_config(self, config: dict | SubplotConfig, replot_last_scan: bool = False):
         """
         Apply the configuration to the 1D waveform widget.
@@ -171,6 +237,48 @@ class BECWaveform(BECPlotBase):
         for curve in self.curves:
             curve.config.parent_id = new_gui_id
 
+    ###################################
+    # Fit Range Properties
+    ###################################
+
+    @property
+    def roi_region(self) -> tuple[float, float] | None:
+        """
+        Get the fit region of the plot widget.
+
+        Returns:
+            tuple: The fit region.
+        """
+        if self._roi_region is not None:
+            return self._roi_region
+        return None, None
+
+    @roi_region.setter
+    def roi_region(self, value: tuple[float, float] | None):
+        """Set the fit region of the plot widget.
+
+        Args:
+            value(tuple[float, float]|None): The fit region.
+        """
+        self._roi_region = value
+        if value is not None:
+            self.request_dap_refresh.emit()
+
+    @Slot(tuple)
+    def set_roi_region(self, region: tuple[float, float]):
+        """
+        Set the fit region of the plot widget.
+
+        Args:
+            region(tuple[float, float]): The fit region.
+        """
+        self.roi_region = region
+
+    def _emit_roi_region(self):
+        """Emit the current ROI from selector the plot widget."""
+        if self.roi_select is not None:
+            self.set_roi_region(self.roi_select.linear_region_selector.getRegion())
+
     ###################################
     # Waveform Properties
     ###################################
@@ -1058,13 +1166,14 @@ class BECWaveform(BECPlotBase):
             y_entry = curve.config.signals.y.entry
             model_name = curve.config.signals.dap
             model = getattr(self.dap, model_name)
+            x_min, x_max = self.roi_region
 
             msg = messages.DAPRequestMessage(
                 dap_cls="LmfitService1D",
                 dap_type="on_demand",
                 config={
                     "args": [self.scan_id, x_name, x_entry, y_name, y_entry],
-                    "kwargs": {},
+                    "kwargs": {"x_min": x_min, "x_max": x_max},
                     "class_args": model._plugin_info["class_args"],
                     "class_kwargs": model._plugin_info["class_kwargs"],
                 },
@@ -1304,7 +1413,8 @@ class BECWaveform(BECPlotBase):
         self.scan_signal_update.emit()
         self.async_signal_update.emit()
 
-    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict | pd.DataFrame:
+    # pylint: ignore: undefined-variable
+    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict:  # | pd.DataFrame:
         """
         Extract all curve data into a dictionary or a pandas DataFrame.
 
@@ -1351,13 +1461,21 @@ class BECWaveform(BECPlotBase):
         """
         MatplotlibExporter(self.plot_item).export()
 
-    def clear_all(self):
+    def clear_source(self, source: Literal["DAP", "async", "scan_segment", "custom"]):
+        """Clear speicific source from self._curves_data.
+
+        Args:
+            source (Literal["DAP", "async", "scan_segment", "custom"]): Source to be cleared.
+        """
         curves_data = self._curves_data
-        sources = list(curves_data.keys())
+        curve_ids_to_remove = list(curves_data[source].keys())
+        for curve_id in curve_ids_to_remove:
+            self.remove_curve(curve_id)
+
+    def clear_all(self):
+        sources = list(self._curves_data.keys())
         for source in sources:
-            curve_ids_to_remove = list(curves_data[source].keys())
-            for curve_id in curve_ids_to_remove:
-                self.remove_curve(curve_id)
+            self.clear_source(source)
 
     def cleanup(self):
         """Cleanup the widget connection from BECDispatcher."""

{bec_widgets-0.105.0 → bec_widgets-0.107.0}/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -13,6 +13,7 @@ from bec_widgets.qt_utils.error_popups import WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import Colors, UILoader
 from bec_widgets.widgets.color_button.color_button import ColorButton
+from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox
 from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
@@ -241,8 +242,9 @@ class DialogRow(QObject):
         self.device_line_edit = DeviceLineEdit()
         self.entry_line_edit = QLineEdit()
 
-        self.dap_combo = QComboBox()
-        self.populate_dap_combobox()
+        self.dap_combo = DapComboBox()
+        self.dap_combo.populate_fit_model_combobox()
+        self.dap_combo.select_fit_model("GaussianModel")
 
         # Styling
         self.color_button = ColorButton()
@@ -261,16 +263,6 @@ class DialogRow(QObject):
             lambda: self.remove_row()
         )  # From some reason do not work without lambda
 
-    def populate_dap_combobox(self):
-        available_models = [
-            attr
-            for attr in dir(self.client.dap)
-            if not attr.startswith("__")
-            and not callable(getattr(self.client.dap, attr))
-            and not attr.startswith("_")
-        ]
-        self.dap_combo.addItems(available_models)
-
     def add_scan_row(self):
         if self.config is not None:
             self.device_line_edit.setText(self.config.signals.y.name)
@@ -298,7 +290,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.dap_combo.setCurrentText(self.config.signals.dap)
+            self.dap_combo.fit_model_combobox.setCurrentText(self.config.signals.dap)
             self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
@@ -312,7 +304,7 @@ class DialogRow(QObject):
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)
-        self.table_widget.setCellWidget(self.row, 2, self.dap_combo)
+        self.table_widget.setCellWidget(self.row, 2, self.dap_combo.fit_model_combobox)
         self.table_widget.setCellWidget(self.row, 3, self.color_button)
         self.table_widget.setCellWidget(self.row, 4, self.style_combo)
         self.table_widget.setCellWidget(self.row, 5, self.width)