Fix: initialize singleobj in BaseROIEditor and BaseROI classes

(remove one `cdl.config.Conf` usage in `sigima_`)

Author: PierreRaybaut

cdl/gui/processor/base.py

@@ -1361,7 +1361,9 @@ def edit_regions_of_interest(self, extract: bool = False) -> TypeROI | None:
                     for obj_i in objs:
                         obj_i.roi = None
                 else:
-                    edited_roi = edited_roi.from_params(obj, params)
+                    edited_roi = edited_roi.__class__.from_params(
+                        obj, params, singleobj=edited_roi.singleobj
+                    )
                     if not extract:
                         for obj_i in objs:
                             obj_i.roi = edited_roi

cdl/gui/roieditor.py

@@ -221,7 +221,16 @@ class BaseROIEditor(
     Generic[TypeObj, TypeROI, TypePlotItem, TypeROIItem],  # type: ignore
     metaclass=BaseROIEditorMeta,
 ):
-    """ROI Editor"""
+    """ROI Editor
+
+    Args:
+        parent: Parent plot dialog
+        obj: Object to edit (:class:`sigima_.obj.SignalObj` or
+         :class:`sigima_.obj.ImageObj`)
+        extract: If True, the dialog is in "extract mode" (extracting ROIs)
+        item: Optional plot item to add to the plot (if None, a new item is created
+         from the object)
+    """
 
     ICON_NAME = None
     OBJ_NAME = None
@@ -247,6 +256,8 @@ def __init__(
         roi = obj.roi
         if roi is None:
             roi = self.get_obj_roi_class()()
+        if roi.singleobj is None:
+            roi.singleobj = Conf.proc.extract_roi_singleobj.get()
         self.__roi: TypeROI = roi
 
         fmt = create_adapter_from_object(obj).get_obj_option("format")
@@ -448,7 +459,16 @@ def get_text(self) -> str:
 
 
 class SignalROIEditor(BaseROIEditor[SignalObj, SignalROI, CurveItem, XRangeSelection]):
-    """Signal ROI Editor"""
+    """Signal ROI Editor
+
+    Args:
+        parent: Parent plot dialog
+        obj: Object to edit (:class:`sigima_.obj.SignalObj` or
+         :class:`sigima_.obj.ImageObj`)
+        extract: If True, the dialog is in "extract mode" (extracting ROIs)
+        item: Optional plot item to add to the plot (if None, a new item is created
+         from the object)
+    """
 
     ICON_NAME = "signal_roi.svg"
     OBJ_NAME = _("signal")
@@ -508,7 +528,16 @@ class ImageROIEditor(
         Union[AnnotatedPolygon, AnnotatedRectangle, AnnotatedCircle],
     ]
 ):
-    """Image ROI Editor"""
+    """Image ROI Editor
+
+    Args:
+        parent: Parent plot dialog
+        obj: Object to edit (:class:`sigima_.obj.SignalObj` or
+         :class:`sigima_.obj.ImageObj`)
+        extract: If True, the dialog is in "extract mode" (extracting ROIs)
+        item: Optional plot item to add to the plot (if None, a new item is created
+         from the object)
+    """
 
     ICON_NAME = "image_roi.svg"
     OBJ_NAME = _("image")

sigima_/obj/base.py

@@ -27,7 +27,7 @@
 import pandas as pd
 from numpy import ma
 
-from cdl.config import Conf, _
+from cdl.config import _
 from sigima_.algorithms import coordinates
 from sigima_.algorithms.datatypes import is_integer_dtype
 
@@ -1229,8 +1229,6 @@ class BaseROI(Generic[TypeObj, TypeSingleROI, TypeROIParam], abc.ABC):  # type:
 
     def __init__(self, singleobj: bool | None = None, inverse: bool = False) -> None:
         self.single_rois: list[TypeSingleROI] = []
-        if singleobj is None:
-            singleobj = Conf.proc.extract_roi_singleobj.get()
         self.singleobj = singleobj
         self.inverse = inverse
 
@@ -1330,13 +1328,19 @@ def to_params(self, obj: TypeObj) -> list[TypeROIParam]:
 
     @classmethod
     def from_params(
-        cls: Type[BaseROI], obj: TypeObj, params: list[TypeROIParam]
+        cls: Type[BaseROI],
+        obj: TypeObj,
+        params: list[TypeROIParam],
+        singleobj: bool | None = None,
+        inverse: bool = False,
     ) -> BaseROI[TypeObj, TypeSingleROI, TypeROIParam]:
         """Create ROIs from parameters
 
         Args:
             obj: object (signal/image)
             params: ROI parameters
+            singleobj: If True, extract all ROIs into a single object
+            inverse: If True, extract the inverse of the ROIs
 
         Returns:
             ROIs
@@ -1345,6 +1349,8 @@ def from_params(
         for param in params:
             assert isinstance(param, BaseROIParam), "Invalid ROI parameter type"
             roi.add_roi(param.to_single_roi(obj))
+        roi.singleobj = singleobj
+        roi.inverse = inverse
         return roi
 
     def to_dict(self) -> dict: