datalab-platform 1.0.2__tar.gz → 1.0.3__tar.gz

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/MANIFEST.in

@@ -2,6 +2,7 @@ graft doc
 graft resources
 graft macros
 graft plugins
+graft datalab/locale
 include conftest.py
 include CONTRIBUTING.md
 include requirements.txt

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-platform
-Version: 1.0.2
+Version: 1.0.3
 Summary: DataLab is a data processing and analysis software for scientific and industrial applications
 Author-email: Pierre Raybaut <p.raybaut@codra.fr>
 Maintainer-email: DataLab Platform Developers <p.raybaut@codra.fr>
@@ -34,7 +34,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: guidata>=3.13.4
 Requires-Dist: PlotPy>=2.8.2
-Requires-Dist: Sigima>=1.0.3
+Requires-Dist: Sigima>=1.0.4
 Requires-Dist: NumPy>=1.22
 Requires-Dist: SciPy>=1.10.1
 Requires-Dist: scikit-image>=0.19.2

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/__init__.py

@@ -24,7 +24,7 @@ except RuntimeError:
     # this module is imported more than once, e.g. when running tests)
     pass
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 __docurl__ = __homeurl__ = "https://datalab-platform.com/"
 __supporturl__ = "https://github.com/DataLab-Platform/DataLab/issues/new/choose"
 

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/adapters_metadata/common.py

@@ -88,7 +88,7 @@ class ResultData:
             if "roi_index" in df.columns:
                 i_roi = int(df.iloc[i_row_res]["roi_index"])
                 roititle = ""
-                if i_roi >= 0:
+                if i_roi >= 0 and obj.roi is not None:
                     roititle = obj.roi.get_single_roi_title(i_roi)
                     ylabel += f"|{roititle}"
             self.ylabels.append(ylabel)
@@ -365,7 +365,7 @@ def resultadapter_to_html(
             num_cols = max_display_cols
 
         # Calculate number of cells (rows × columns)
-        num_rows = len(adapter.result)
+        num_rows = len(df)
         num_cells = num_rows * num_cols
 
         # Check if truncation is needed BEFORE calling to_html()

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/config.py

@@ -487,6 +487,8 @@ initialize()
 
 ROI_LINE_COLOR = "#5555ff"
 ROI_SEL_LINE_COLOR = "#9393ff"
+MARKER_LINE_COLOR = "#A11818"
+MARKER_TEXT_COLOR = "#440909"
 
 PLOTPY_DEFAULTS = {
     "plot": {
@@ -508,11 +510,27 @@ PLOTPY_DEFAULTS = {
         "selected_curve_symbol/alpha": 0.3,
         "selected_curve_symbol/size": 5,
         "marker/curve/text/textcolor": "black",
-        "marker/cross/text/textcolor": "black",
+        # Cross marker style (shown when pressing Alt key on plot)
+        "marker/cross/symbol/marker": "Cross",
+        "marker/cross/symbol/edgecolor": MAIN_FG_COLOR,
+        "marker/cross/symbol/facecolor": "#ff0000",
+        "marker/cross/symbol/alpha": 1.0,
+        "marker/cross/symbol/size": 8,
+        "marker/cross/text/font/family": "default",
+        "marker/cross/text/font/size": 8,
+        "marker/cross/text/font/bold": False,
+        "marker/cross/text/font/italic": False,
+        "marker/cross/text/textcolor": "#000000",
+        "marker/cross/text/background_color": "#ffffff",
         "marker/cross/text/background_alpha": 0.7,
+        "marker/cross/line/style": "DashLine",
+        "marker/cross/line/color": MARKER_LINE_COLOR,
+        "marker/cross/line/width": 1.0,
+        "marker/cross/markerstyle": "Cross",
+        "marker/cross/spacing": 7,
         # Cursor line and symbol style
         "marker/cursor/line/style": "SolidLine",
-        "marker/cursor/line/color": "#A11818",
+        "marker/cursor/line/color": MARKER_LINE_COLOR,
         "marker/cursor/line/width": 1.0,
         "marker/cursor/symbol/marker": "NoSymbol",
         "marker/cursor/symbol/size": 11,
@@ -520,41 +538,83 @@ PLOTPY_DEFAULTS = {
         "marker/cursor/symbol/facecolor": "#ff9393",
         "marker/cursor/symbol/alpha": 1.0,
         "marker/cursor/sel_line/style": "SolidLine",
-        "marker/cursor/sel_line/color": "#A11818",
+        "marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "marker/cursor/sel_line/width": 2.0,
         "marker/cursor/sel_symbol/marker": "NoSymbol",
         "marker/cursor/sel_symbol/size": 11,
         "marker/cursor/sel_symbol/edgecolor": MAIN_BG_COLOR,
-        "marker/cursor/sel_symbol/facecolor": "#A11818",
+        "marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "marker/cursor/sel_symbol/alpha": 0.8,
         "marker/cursor/text/font/size": 9,
         "marker/cursor/text/font/family": "default",
         "marker/cursor/text/font/bold": False,
         "marker/cursor/text/font/italic": False,
-        "marker/cursor/text/textcolor": "#440909",
+        "marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "marker/cursor/text/background_color": "#ffffff",
         "marker/cursor/text/background_alpha": 0.7,
         "marker/cursor/sel_text/font/size": 9,
         "marker/cursor/sel_text/font/family": "default",
         "marker/cursor/sel_text/font/bold": False,
         "marker/cursor/sel_text/font/italic": False,
-        "marker/cursor/sel_text/textcolor": "#440909",
+        "marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "marker/cursor/sel_text/background_color": "#ffffff",
         "marker/cursor/sel_text/background_alpha": 0.7,
+        # Default annotation text style for segments:
+        "shape/segment/line/style": "SolidLine",
+        "shape/segment/line/color": "#00ff55",
+        "shape/segment/line/width": 1.0,
+        "shape/segment/sel_line/style": "SolidLine",
+        "shape/segment/sel_line/color": "#00ff55",
+        "shape/segment/sel_line/width": 2.0,
+        "shape/segment/fill/style": "NoBrush",
+        "shape/segment/sel_fill/style": "NoBrush",
+        "shape/segment/symbol/marker": "XCross",
+        "shape/segment/symbol/size": 9,
+        "shape/segment/symbol/edgecolor": "#00ff55",
+        "shape/segment/symbol/facecolor": "#00ff55",
+        "shape/segment/symbol/alpha": 1.0,
+        "shape/segment/sel_symbol/marker": "XCross",
+        "shape/segment/sel_symbol/size": 12,
+        "shape/segment/sel_symbol/edgecolor": "#00ff55",
+        "shape/segment/sel_symbol/facecolor": "#00ff55",
+        "shape/segment/sel_symbol/alpha": 0.7,
+        # Default style for drag shapes: (global annotations style)
+        "shape/drag/line/style": "SolidLine",
+        "shape/drag/line/color": "#00ff55",
+        "shape/drag/line/width": 1.0,
+        "shape/drag/fill/style": "SolidPattern",
+        "shape/drag/fill/color": MAIN_BG_COLOR,
+        "shape/drag/fill/alpha": 0.1,
+        "shape/drag/symbol/marker": "Rect",
+        "shape/drag/symbol/size": 3,
+        "shape/drag/symbol/edgecolor": "#00ff55",
+        "shape/drag/symbol/facecolor": "#00ff55",
+        "shape/drag/symbol/alpha": 1.0,
+        "shape/drag/sel_line/style": "SolidLine",
+        "shape/drag/sel_line/color": "#00ff55",
+        "shape/drag/sel_line/width": 2.0,
+        "shape/drag/sel_fill/style": "SolidPattern",
+        "shape/drag/sel_fill/color": MAIN_BG_COLOR,
+        "shape/drag/sel_fill/alpha": 0.1,
+        "shape/drag/sel_symbol/marker": "Rect",
+        "shape/drag/sel_symbol/size": 7,
+        "shape/drag/sel_symbol/edgecolor": "#00ff55",
+        "shape/drag/sel_symbol/facecolor": "#00ff00",
+        "shape/drag/sel_symbol/alpha": 0.7,
     },
     "results": {
         # Annotated shape style for result shapes:
         #   Signals:
         "s/annotation/line/style": "SolidLine",
-        "s/annotation/line/color": MAIN_FG_COLOR,
-        "s/annotation/line/width": 1,
-        "s/annotation/fill/style": "SolidPattern",
+        "s/annotation/line/color": "#00aa00",
+        "s/annotation/line/width": 2,
+        "s/annotation/fill/style": "NoBrush",
         "s/annotation/fill/color": MAIN_BG_COLOR,
         "s/annotation/fill/alpha": 0.1,
         "s/annotation/symbol/marker": "XCross",
         "s/annotation/symbol/size": 7,
-        "s/annotation/symbol/edgecolor": MAIN_FG_COLOR,
-        "s/annotation/symbol/facecolor": MAIN_FG_COLOR,
+        "s/annotation/symbol/edgecolor": "#00aa00",
+        "s/annotation/symbol/facecolor": "#00aa00",
         "s/annotation/symbol/alpha": 1.0,
         "s/annotation/sel_line/style": "DashLine",
         "s/annotation/sel_line/color": "#00ff00",
@@ -593,65 +653,65 @@ PLOTPY_DEFAULTS = {
         # Marker styles for results:
         #   Signals:
         "s/marker/cursor/line/style": "DashLine",
-        "s/marker/cursor/line/color": "#ffff00",
+        "s/marker/cursor/line/color": MARKER_LINE_COLOR,
         "s/marker/cursor/line/width": 1.0,
         "s/marker/cursor/symbol/marker": "Ellipse",
         "s/marker/cursor/symbol/size": 11,
         "s/marker/cursor/symbol/edgecolor": MAIN_BG_COLOR,
-        "s/marker/cursor/symbol/facecolor": "#ffff00",
+        "s/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
         "s/marker/cursor/symbol/alpha": 0.7,
         "s/marker/cursor/sel_line/style": "DashLine",
-        "s/marker/cursor/sel_line/color": "#ffff00",
+        "s/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "s/marker/cursor/sel_line/width": 2.0,
         "s/marker/cursor/sel_symbol/marker": "Ellipse",
         "s/marker/cursor/sel_symbol/size": 11,
-        "s/marker/cursor/sel_symbol/edgecolor": "#ffff00",
-        "s/marker/cursor/sel_symbol/facecolor": "#ffff00",
+        "s/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
+        "s/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "s/marker/cursor/sel_symbol/alpha": 0.7,
         "s/marker/cursor/text/font/size": 9,
         "s/marker/cursor/text/font/family": "default",
         "s/marker/cursor/text/font/bold": False,
         "s/marker/cursor/text/font/italic": False,
-        "s/marker/cursor/text/textcolor": "#440909",
+        "s/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "s/marker/cursor/text/background_color": "#ffffff",
         "s/marker/cursor/text/background_alpha": 0.7,
         "s/marker/cursor/sel_text/font/size": 9,
         "s/marker/cursor/sel_text/font/family": "default",
         "s/marker/cursor/sel_text/font/bold": False,
         "s/marker/cursor/sel_text/font/italic": False,
-        "s/marker/cursor/sel_text/textcolor": "#440909",
+        "s/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "s/marker/cursor/sel_text/background_color": "#ffffff",
         "s/marker/cursor/sel_text/background_alpha": 0.7,
         "s/marker/cursor/markerstyle": "Cross",
         #   Images:
         "i/marker/cursor/line/style": "DashLine",
-        "i/marker/cursor/line/color": "#ffff00",
+        "i/marker/cursor/line/color": MARKER_LINE_COLOR,
         "i/marker/cursor/line/width": 1.0,
         "i/marker/cursor/symbol/marker": "Diamond",
         "i/marker/cursor/symbol/size": 11,
-        "i/marker/cursor/symbol/edgecolor": "#ffff00",
-        "i/marker/cursor/symbol/facecolor": "#ffff00",
+        "i/marker/cursor/symbol/edgecolor": MARKER_LINE_COLOR,
+        "i/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
         "i/marker/cursor/symbol/alpha": 0.7,
         "i/marker/cursor/sel_line/style": "DashLine",
-        "i/marker/cursor/sel_line/color": "#ffff00",
+        "i/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "i/marker/cursor/sel_line/width": 2.0,
         "i/marker/cursor/sel_symbol/marker": "Diamond",
         "i/marker/cursor/sel_symbol/size": 11,
-        "i/marker/cursor/sel_symbol/edgecolor": "#ffff00",
-        "i/marker/cursor/sel_symbol/facecolor": "#ffff00",
+        "i/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
+        "i/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "i/marker/cursor/sel_symbol/alpha": 0.7,
         "i/marker/cursor/text/font/size": 9,
         "i/marker/cursor/text/font/family": "default",
         "i/marker/cursor/text/font/bold": False,
         "i/marker/cursor/text/font/italic": False,
-        "i/marker/cursor/text/textcolor": "#440909",
+        "i/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "i/marker/cursor/text/background_color": "#ffffff",
         "i/marker/cursor/text/background_alpha": 0.7,
         "i/marker/cursor/sel_text/font/size": 9,
         "i/marker/cursor/sel_text/font/family": "default",
         "i/marker/cursor/sel_text/font/bold": False,
         "i/marker/cursor/sel_text/font/italic": False,
-        "i/marker/cursor/sel_text/textcolor": "#440909",
+        "i/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "i/marker/cursor/sel_text/background_color": "#ffffff",
         "i/marker/cursor/sel_text/background_alpha": 0.7,
         "i/marker/cursor/markerstyle": "Cross",

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/control/baseproxy.py

@@ -198,6 +198,41 @@ class AbstractDLControl(abc.ABC):
             reset_all: Reset all application data. Defaults to None.
         """
 
+    @abc.abstractmethod
+    def load_h5_workspace(self, h5files: list[str], reset_all: bool = False) -> None:
+        """Load native DataLab HDF5 workspace files without any GUI elements.
+
+        This method can be safely called from scripts (e.g., internal console,
+        macros) as it does not create any Qt widgets, dialogs, or progress bars.
+
+        .. warning::
+
+            This method only supports native DataLab HDF5 files. For importing
+            arbitrary HDF5 files (non-native), use :meth:`open_h5_files` or
+            :meth:`import_h5_file` instead.
+
+        Args:
+            h5files: List of native DataLab HDF5 filenames
+            reset_all: Reset all application data before importing. Defaults to False.
+
+        Raises:
+            ValueError: If a file is not a valid native DataLab HDF5 file
+        """
+
+    @abc.abstractmethod
+    def save_h5_workspace(self, filename: str) -> None:
+        """Save current workspace to a native DataLab HDF5 file without GUI elements.
+
+        This method can be safely called from scripts (e.g., internal console,
+        macros) as it does not create any Qt widgets, dialogs, or progress bars.
+
+        Args:
+            filename: HDF5 filename to save to
+
+        Raises:
+            IOError: If file cannot be saved
+        """
+
     @abc.abstractmethod
     def load_from_files(self, filenames: list[str]) -> None:
         """Open objects from files in current panel (signals/images).
@@ -607,6 +642,41 @@ class BaseProxy(AbstractDLControl, metaclass=abc.ABCMeta):
         """
         self._datalab.import_h5_file(filename, reset_all)
 
+    def load_h5_workspace(self, h5files: list[str], reset_all: bool = False) -> None:
+        """Load native DataLab HDF5 workspace files without any GUI elements.
+
+        This method can be safely called from scripts (e.g., internal console,
+        macros) as it does not create any Qt widgets, dialogs, or progress bars.
+
+        .. warning::
+
+            This method only supports native DataLab HDF5 files. For importing
+            arbitrary HDF5 files (non-native), use :meth:`open_h5_files` or
+            :meth:`import_h5_file` instead.
+
+        Args:
+            h5files: List of native DataLab HDF5 filenames
+            reset_all: Reset all application data before importing. Defaults to False.
+
+        Raises:
+            ValueError: If a file is not a valid native DataLab HDF5 file
+        """
+        self._datalab.load_h5_workspace(h5files, reset_all)
+
+    def save_h5_workspace(self, filename: str) -> None:
+        """Save current workspace to a native DataLab HDF5 file without GUI elements.
+
+        This method can be safely called from scripts (e.g., internal console,
+        macros) as it does not create any Qt widgets, dialogs, or progress bars.
+
+        Args:
+            filename: HDF5 filename to save to
+
+        Raises:
+            IOError: If file cannot be saved
+        """
+        self._datalab.save_h5_workspace(filename)
+
     def load_from_files(self, filenames: list[str]) -> None:
         """Open objects from files in current panel (signals/images).
 

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/control/proxy.py

@@ -300,6 +300,39 @@ class LocalProxy(BaseProxy):
         """
         self._datalab.add_annotations_from_items(items, refresh_plot, panel)
 
+    def load_h5_workspace(
+        self, h5files: list[str] | str, reset_all: bool = False
+    ) -> None:
+        """Load HDF5 workspace files without showing file dialog.
+
+        This method loads one or more DataLab native HDF5 files directly, bypassing
+        the file dialog. It is safe to call from the internal console or any context
+        where Qt dialogs would cause threading issues.
+
+        Args:
+            h5files: Path(s) to HDF5 file(s). Can be a single path string or a list
+             of paths
+            reset_all: If True, reset workspace before loading. Defaults to False.
+
+        Raises:
+            ValueError: if file is not a DataLab native HDF5 file
+        """
+        if isinstance(h5files, str):
+            h5files = [h5files]
+        self._datalab.load_h5_workspace(h5files, reset_all)
+
+    def save_h5_workspace(self, filename: str) -> None:
+        """Save workspace to HDF5 file without showing file dialog.
+
+        This method saves the current workspace to a DataLab native HDF5 file
+        directly, bypassing the file dialog. It is safe to call from the internal
+        console or any context where Qt dialogs would cause threading issues.
+
+        Args:
+            filename: Path to the output HDF5 file
+        """
+        self._datalab.save_h5_workspace(filename)
+
 
 @contextmanager
 def proxy_context(what: str) -> Generator[LocalProxy | RemoteProxy, None, None]:

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/control/remote.py

@@ -84,6 +84,8 @@ class RemoteServer(QC.QThread):
     SIG_SAVE_TO_H5 = QC.Signal(str)
     SIG_OPEN_H5 = QC.Signal(list, bool, bool)
     SIG_IMPORT_H5 = QC.Signal(str, bool)
+    SIG_LOAD_H5_WORKSPACE = QC.Signal(list, bool)
+    SIG_SAVE_H5_WORKSPACE = QC.Signal(str)
     SIG_CALC = QC.Signal(str, object)
     SIG_RUN_MACRO = QC.Signal(str)
     SIG_STOP_MACRO = QC.Signal(str)
@@ -114,6 +116,8 @@ class RemoteServer(QC.QThread):
         self.SIG_SAVE_TO_H5.connect(win.save_to_h5_file)
         self.SIG_OPEN_H5.connect(win.open_h5_files)
         self.SIG_IMPORT_H5.connect(win.import_h5_file)
+        self.SIG_LOAD_H5_WORKSPACE.connect(win.load_h5_workspace)
+        self.SIG_SAVE_H5_WORKSPACE.connect(win.save_h5_workspace)
         self.SIG_CALC.connect(win.calc)
         self.SIG_RUN_MACRO.connect(win.run_macro)
         self.SIG_STOP_MACRO.connect(win.stop_macro)
@@ -268,6 +272,37 @@ class RemoteServer(QC.QThread):
         reset_all = False if reset_all is None else reset_all
         self.SIG_IMPORT_H5.emit(filename, reset_all)
 
+    @remote_call
+    def load_h5_workspace(self, h5files: list[str], reset_all: bool = False) -> None:
+        """Load native DataLab HDF5 workspace files without any GUI elements.
+
+        This method can be safely called from scripts as it does not create
+        any Qt widgets, dialogs, or progress bars.
+
+        Args:
+            h5files: List of native DataLab HDF5 filenames
+            reset_all: Reset all application data before importing. Defaults to False.
+
+        Raises:
+            ValueError: If a file is not a valid native DataLab HDF5 file
+        """
+        self.SIG_LOAD_H5_WORKSPACE.emit(h5files, reset_all)
+
+    @remote_call
+    def save_h5_workspace(self, filename: str) -> None:
+        """Save current workspace to a native DataLab HDF5 file without GUI elements.
+
+        This method can be safely called from scripts as it does not create
+        any Qt widgets, dialogs, or progress bars.
+
+        Args:
+            filename: HDF5 filename to save to
+
+        Raises:
+            IOError: If file cannot be saved
+        """
+        self.SIG_SAVE_H5_WORKSPACE.emit(filename)
+
     @remote_call
     def load_from_files(self, filenames: list[str]) -> None:
         """Open objects from files in current panel (signals/images).

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/data/icons/create/linear_chirp.svg

@@ -3,5 +3,5 @@
     xmlns="http://www.w3.org/2000/svg">
     <rect style="fill:#696969;fill-opacity:1;stroke-width:0.547874" width="0.53186357" height="12.584304" x="6.7340684" y="0.70784807" />
     <rect style="fill:#696969;fill-opacity:1;stroke-width:0.54642" width="0.53186357" height="12.5176" x="6.7340684" y="-13.258801" transform="rotate(90)" />
-    <path style="fill:none;stroke:#009966;stroke-width:0.35;stroke-linejoin:round" d="M 1,7 C 1.5,5.5 2,4.5 2.5,5.5 3,7 3.3,8.5 3.6,7.5 3.9,6 4.2,4 4.5,5 4.8,6.5 5,8.5 5.3,7.5 5.6,6 5.9,3.5 6.3,5 6.7,7 6.9,9.5 7.2,7.5 7.5,5 7.8,2 8.2,5 8.6,8 8.9,11 9.3,8 9.7,5 10.1,2 10.6,5.5 11.1,9 11.6,12 12.2,8.5 12.8,5 13,2" />
+    <path style="fill:none;stroke:#009966;stroke-width:0.35;stroke-linejoin:round" d="M 1,7 C 1.5,5.5 2,4.5 2.5,5.5 C 3,7 3.3,8.5 3.6,7.5 C 3.9,6 4.2,4 4.5,5 C 4.8,6.5 5,8.5 5.3,7.5 C 5.6,6 5.9,3.5 6.3,5 C 6.7,7 6.9,9.5 7.2,7.5 C 7.5,5 7.8,2 8.2,5 C 8.6,8 8.9,11 9.3,8 C 9.7,5 10.1,2 10.6,5.5 C 11.1,9 11.6,12 12.2,8.5 C 12.8,5 13,3.5 13,2" />
 </svg>

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/data/icons/create/logistic.svg

@@ -3,5 +3,5 @@
     xmlns="http://www.w3.org/2000/svg">
     <rect style="fill:#696969;fill-opacity:1;stroke-width:0.547874" width="0.53186357" height="12.584304" x="6.7340684" y="0.70784807" />
     <rect style="fill:#696969;fill-opacity:1;stroke-width:0.54642" width="0.53186357" height="12.5176" x="6.7340684" y="-13.258801" transform="rotate(90)" />
-    <path style="fill:none;stroke:#9900cc;stroke-width:0.35;stroke-linejoin:round" d="M 1.5,12 C 2,12 2.5,12 3,11.9 3.5,11.8 4,11.6 4.5,11.2 5,10.8 5.5,10.2 6,9.5 6.5,8.5 7,7.2 7.5,5.5 8,4 8.5,3 9,2.5 9.5,2.2 10,2.1 10.5,2.05 11,2.02 11.5,2.01 12,2 12.5,2" />
+    <path style="fill:none;stroke:#9900cc;stroke-width:0.35;stroke-linejoin:round" d="M 1.5,12 C 2,12 2.5,12 3,11.9 C 3.5,11.8 4,11.6 4.5,11.2 C 5,10.8 5.5,10.2 6,9.5 C 6.5,8.5 7,7.2 7.5,5.5 C 8,4 8.5,3 9,2.5 C 9.5,2.2 10,2.1 10.5,2.05 C 11,2.02 11.5,2.01 12,2 L 12.5,2" />
 </svg>

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/gui/actionhandler.py

@@ -50,6 +50,10 @@ from qtpy import QtWidgets as QW
 from datalab.adapters_metadata import GeometryAdapter, TableAdapter, have_results
 from datalab.config import Conf, _
 from datalab.gui import newobject
+from datalab.gui.processor.base import (
+    clear_analysis_parameters,
+    extract_analysis_parameters,
+)
 from datalab.widgets import fitdialog
 
 if TYPE_CHECKING:
@@ -361,6 +365,15 @@ class BaseActionHandler(metaclass=abc.ABCMeta):
             obj: Object containing the result
             adapter: Adapter for the result to delete
         """
+        # Check if this result matches the stored analysis parameters
+        # If so, clear them to prevent auto-recompute from attempting to
+        # recompute the deleted analysis when ROI changes
+        analysis_params = extract_analysis_parameters(obj)
+        if (
+            analysis_params is not None
+            and analysis_params.func_name == adapter.func_name
+        ):
+            clear_analysis_parameters(obj)
         adapter.remove_from(obj)
         # Update properties panel to reflect the removal
         if obj is self.panel.objview.get_current_object():

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/gui/h5io.py

@@ -54,6 +54,31 @@ class H5InputOutput:
             panel.serialize_to_hdf5(writer)
         writer.close()
 
+    def open_file_headless(self, filename: str, reset_all: bool) -> bool:
+        """Open native DataLab HDF5 file without any GUI elements.
+
+        This method can be safely called from any thread (e.g., the console thread)
+        as it does not create any Qt widgets or dialogs.
+
+        Args:
+            filename: HDF5 filename
+            reset_all: Reset all application data before importing
+
+        Returns:
+            True if file was successfully opened as a native DataLab file,
+            False if the file format is not compatible (KeyError was raised)
+        """
+        try:
+            reader = NativeH5Reader(filename)
+            if reset_all:
+                self.mainwindow.reset_all()
+            for panel in self.mainwindow.panels:
+                panel.deserialize_from_hdf5(reader, reset_all)
+            reader.close()
+            return True
+        except KeyError:
+            return False
+
     def open_file(self, filename: str, import_all: bool, reset_all: bool) -> None:
         """Open HDF5 file"""
         progress = None

{datalab_platform-1.0.2 → datalab_platform-1.0.3}/datalab/gui/macroeditor.py

@@ -186,8 +186,20 @@ print("All done!")
         """
         global UNTITLED_NB  # pylint: disable=global-statement
         UNTITLED_NB += 1
-        untitled = _("Untitled")
-        return f"{untitled} {UNTITLED_NB:02d}"
+        return f"macro_{UNTITLED_NB:02d}"
+
+    @staticmethod
+    def set_untitled_number(number: int) -> None:
+        """Set the untitled number counter
+
+        This is useful when loading macros from HDF5 or files to ensure
+        that the next untitled macro has a unique name.
+
+        Args:
+            number: New untitled number
+        """
+        global UNTITLED_NB  # pylint: disable=global-statement
+        UNTITLED_NB = number
 
     def modification_changed(self, state: bool) -> None:
         """Method called when macro's editor modification state changed
@@ -208,8 +220,10 @@ print("All done!")
         Returns:
             Locale str
         """
-        locale_codec = QC.QTextCodec.codecForLocale()
-        return locale_codec.toUnicode(bytearr.data())
+        # Python 3 outputs UTF-8 by default, so we need to decode as UTF-8
+        # instead of using the system locale codec (which might be cp1252 on Windows)
+        utf8_codec = QC.QTextCodec.codecForName(b"UTF-8")
+        return utf8_codec.toUnicode(bytearr.data())
 
     def get_stdout(self) -> str:
         """Return standard output str
@@ -258,7 +272,7 @@ print("All done!")
     def run(self) -> None:
         """Run macro"""
         self.process = QC.QProcess()
-        code = self.get_code().replace('"', "'")
+        code = self.get_code()
         datalab_path = osp.abspath(osp.join(osp.dirname(datalab.__file__), os.pardir))
         # Reconfigure stdout/stderr to use UTF-8 encoding to avoid UnicodeEncodeError
         # on Windows with locales that don't support all Unicode characters