Merge remote-tracking branch 'origin/develop' into develop

Author: PierreRaybaut

CHANGELOG.md

@@ -185,6 +185,14 @@ See DataLab [roadmap page](https://datalab-platform.com/en/contributing/roadmap.
       * Planckian (blackbody) fitting with physics-correct parameter bounds
       * Asymmetric peak fitting (two-half Gaussian) with independent left/right parameters
       * CDF (Cumulative Distribution Function) fitting for statistical analysis
+    * **Locked parameter support** (requires PlotPy v2.8.0):
+      * Added ability to lock individual fit parameters during automatic optimization
+      * Users can manually adjust parameters and lock them to prevent changes during auto-fit
+      * Visual indicators: locked parameters show 🔒 emoji and are grayed out with disabled controls
+      * Enables partial optimization workflows: fix well-determined parameters, optimize uncertain ones
+      * All optimization algorithms (simplex, Powell, BFGS, L-BFGS-B, conjugate gradient, least squares) support locked parameters
+      * Improves fit convergence by reducing problem dimensionality
+      * Lock/unlock parameters via the parameter settings dialog (gear icon)
     * **Improved user experience**: The curve fitting dialogs now provide:
       * More reliable initial parameter guesses reducing manual adjustment needs
       * Better parameter bounds preventing optimization failures

datalab/config.py

@@ -121,6 +121,7 @@ class MainSection(conf.Section, metaclass=conf.SectionMeta):
     plugins_enabled = conf.Option()
     plugins_path = conf.Option()
     tour_enabled = conf.Option()
+    v020_plugins_warning_ignore = conf.Option()  # True: do not warn, False: warn
 
 
 class ConsoleSection(conf.Section, metaclass=conf.SectionMeta):
@@ -341,6 +342,7 @@ def initialize():
     Conf.main.plugins_enabled.get(True)
     Conf.main.plugins_path.get(Conf.get_path("plugins"))
     Conf.main.tour_enabled.get(True)
+    Conf.main.v020_plugins_warning_ignore.get(False)
     # Console section
     Conf.console.console_enabled.get(True)
     Conf.console.show_console_on_error.get(False)

datalab/gui/actionhandler.py

@@ -1084,6 +1084,7 @@ def cra_fit(title, fitdlgfunc, tip: str | None = None):
                 ):
                     self.action_for(fit_name, separator=separator_needed)
                     separator_needed = False
+                self.action_for("evaluate_fit", separator=True)
             self.action_for("apply_window")
             self.action_for("detrending")
             self.action_for("interpolate")

datalab/gui/main.py

@@ -63,7 +63,7 @@
 from datalab.gui.h5io import H5InputOutput
 from datalab.gui.panel import base, image, macro, signal
 from datalab.gui.settings import edit_settings
-from datalab.plugins import PluginRegistry, discover_plugins
+from datalab.plugins import PluginRegistry, discover_plugins, discover_v020_plugins
 from datalab.utils import dephash
 from datalab.utils import qthelpers as qth
 from datalab.utils.qthelpers import (
@@ -651,10 +651,64 @@ def check_for_previous_crash(self) -> None:  # pragma: no cover
             if choice == QW.QMessageBox.StandardButton.Yes:
                 self.__show_logviewer()
 
+    def check_for_v020_plugins(self) -> None:  # pragma: no cover
+        """Check for v0.20 plugins and warn user if any are found"""
+        if Conf.main.v020_plugins_warning_ignore.get(False):
+            return
+
+        v020_plugins = discover_v020_plugins()
+        if execenv.unattended or not v020_plugins:
+            return
+
+        # Build plugin list with clickable directory paths
+        plugin_items = []
+        for name, directory_path in v020_plugins:
+            if directory_path:
+                # Create clickable file:// link to directory
+                dir_url = QC.QUrl.fromLocalFile(directory_path).toString()
+                plugin_items.append(
+                    f'<li>{name} (<a href="{dir_url}">{directory_path}</a>)</li>'
+                )
+            else:
+                plugin_items.append(f"<li>{name}</li>")
+        plugin_list = "<ul>" + "".join(plugin_items) + "</ul>"
+
+        txtlist = [
+            "<b>" + _("DataLab v0.20 plugins detected") + "</b>",
+            "",
+            _("The following plugins are using the old DataLab v0.20 format:"),
+            plugin_list,
+            _(
+                "These plugins will <b>not be loaded</b> in DataLab v1.0 because "
+                "they are not compatible with the new architecture."
+            ),
+            "",
+            _(
+                "To use these plugins with DataLab v1.0, you need to update them. "
+                "Please refer to the migration guide on the DataLab website "
+            )
+            + '(<a href="https://datalab-platform.com/en/features/advanced/'
+            'migration_v020_to_v100.html">Migration guide</a>)'
+            + _(" or in the PDF documentation."),
+            "",
+            _("Choosing to ignore this message will prevent it from appearing again."),
+        ]
+
+        answer = QW.QMessageBox.question(
+            self,
+            APP_NAME,
+            "<br>".join(txtlist),
+            QW.QMessageBox.Ok | QW.QMessageBox.Ignore,
+        )
+
+        if answer == QW.QMessageBox.Ignore:
+            Conf.main.v020_plugins_warning_ignore.set(True)
+
     def execute_post_show_actions(self) -> None:
         """Execute post-show actions"""
         self.check_stable_release()
         self.check_for_previous_crash()
+        self.check_for_v020_plugins()
         tour = Conf.main.tour_enabled.get()
         if tour:
             Conf.main.tour_enabled.set(False)
@@ -895,7 +949,7 @@ def __setup_global_actions(self) -> None:
             _("Auto-refresh"),
             icon=get_icon("refresh-auto.svg"),
             tip=_("Auto-refresh plot when object is modified, added or removed"),
-            toggled=self.toggle_auto_refresh,
+            toggled=self.handle_autorefresh_action,
         )
         self.showfirstonly_action = create_action(
             self,
@@ -1385,6 +1439,48 @@ def toggle_show_titles(self, state: bool) -> None:
                 obj.set_metadata_option("showlabel", state)
             datapanel.refresh_plot("selected", True, False)
 
+    def handle_autorefresh_action(self, state: bool) -> None:
+        """Handle auto-refresh action from UI (with confirmation dialog)
+
+        Args:
+            state: desired state
+        """
+        # If disabling auto-refresh, show confirmation dialog
+        if not state:
+            txtlist = [
+                "<b>" + _("Disable auto-refresh?") + "</b>",
+                "",
+                _(
+                    "When auto-refresh is disabled, the plot view will not "
+                    "automatically update when objects are modified, added or removed."
+                ),
+                "",
+                _(
+                    "You will need to manually click the refresh button to update "
+                    "the view."
+                ),
+                "",
+                _("Are you sure you want to disable auto-refresh?"),
+            ]
+
+            answer = QW.QMessageBox.question(
+                self,
+                APP_NAME,
+                "<br>".join(txtlist),
+                QW.QMessageBox.Yes | QW.QMessageBox.No,
+                QW.QMessageBox.No,
+            )
+
+            if answer == QW.QMessageBox.No:
+                # User cancelled, restore the action's checked state
+                self.autorefresh_action.blockSignals(True)
+                self.autorefresh_action.setChecked(True)
+                self.autorefresh_action.blockSignals(False)
+                return
+
+        # Apply the change
+        self.toggle_auto_refresh(state)
+
     @remote_controlled
     def toggle_auto_refresh(self, state: bool) -> None:
         """Toggle auto refresh option

datalab/gui/processor/signal.py

@@ -42,6 +42,21 @@
 class SignalProcessor(BaseProcessor[SignalROI, ROI1DParam]):
     """Object handling signal processing: operations, processing, analysis"""
 
+    FIT_FUNCTIONS = (
+        (_("Linear fit"), sips.linear_fit),
+        (_("Polynomial fit"), sips.polynomial_fit),
+        (_("Gaussian fit"), sips.gaussian_fit),
+        (_("Lorentzian fit"), sips.lorentzian_fit),
+        (_("Voigt fit"), sips.voigt_fit),
+        (_("Planckian fit"), sips.planckian_fit),
+        (_("Two Half-Gaussians fit"), sips.twohalfgaussian_fit),
+        (_("Piecewise exponential fit"), sips.piecewiseexponential_fit),
+        (_("Exponential fit"), sips.exponential_fit),
+        (_("Sinusoidal fit"), sips.sinusoidal_fit),
+        (_("CDF fit"), sips.cdf_fit),
+        (_("Sigmoid fit"), sips.sigmoid_fit),
+    )
+
     # pylint: disable=duplicate-code
 
     def register_operations(self) -> None:
@@ -342,23 +357,18 @@ def register_processing(self) -> None:
             "bandstop.svg",
         )
         # Curve fitting
-        for fit_name, fit_func in [
-            (_("Linear fit"), sips.linear_fit),
-            (_("Polynomial fit"), sips.polynomial_fit),
-            (_("Gaussian fit"), sips.gaussian_fit),
-            (_("Lorentzian fit"), sips.lorentzian_fit),
-            (_("Voigt fit"), sips.voigt_fit),
-            (_("Planckian fit"), sips.planckian_fit),
-            (_("Two Half-Gaussians fit"), sips.twohalfgaussian_fit),
-            (_("Piecewise exponential fit"), sips.piecewiseexponential_fit),
-            (_("Exponential fit"), sips.exponential_fit),
-            (_("Sinusoidal fit"), sips.sinusoidal_fit),
-            (_("CDF fit"), sips.cdf_fit),
-            (_("Sigmoid fit"), sips.sigmoid_fit),
-        ]:
+        for fit_name, fit_func in self.FIT_FUNCTIONS:
             icon_name = f"{fit_func.__name__}.svg"
             self.register_1_to_1(fit_func, fit_name, icon_name=icon_name)
 
+        # Evaluate fit on another signal's x-axis
+        self.register_2_to_1(
+            sips.evaluate_fit,
+            _("Evaluate fit"),
+            obj2_name=_("signal for X values"),
+            comment=_("Evaluate a fitting curve on the x-axis of another signal"),
+        )
+
         # Other processing
         self.register_1_to_1(
             sips.apply_window,

datalab/gui/settings.py

@@ -69,6 +69,14 @@ class MainSettings(gds.DataSet):
             "as well as in your PYTHONPATH."
         ),
     )
+    v020_plugins_warning_ignore = gds.BoolItem(
+        _("Ignore compatibility issues warning"),
+        _("DataLab v0.20 plugins"),
+        help=_(
+            "If enabled, DataLab will not warn you about v0.20 plugins that are "
+            "no longer compatible with v1.0."
+        ),
+    )
     _g0 = gds.EndGroup("")
 
 
@@ -137,17 +145,17 @@ class ProcSettings(gds.DataSet):
         % ("→", "→"),
     )
     use_signal_bounds = gds.BoolItem(
-        "",
-        _("Use signal bounds for new signals"),
+        _("Use current signal bounds"),
+        _("New signals"),
         help=_(
             "If enabled, when creating a new signal, the xmin and xmax values will be "
             "initialized from the current signal's bounds.<br>"
             "If disabled, the default values from the New Signal dialog will be used."
         ),
     )
     use_image_dims = gds.BoolItem(
-        "",
-        _("Use image dimensions for new images"),
+        _("Use current image dimensions"),
+        _("New images"),
         help=_(
             "If enabled, when creating a new image, the width and height values will "
             "be initialized from the current image's dimensions.<br>"