Refactor ROI title generation to use dedicated functions for consistency

Author: PierreRaybaut

datalab/adapters_plotpy/base.py

@@ -47,6 +47,7 @@
     TypeROI,
     TypeROIParam,
     TypeSingleROI,
+    get_generic_roi_title,
 )
 from sigima.tools import coordinates
 
@@ -502,7 +503,7 @@ def iterate_roi_items(
             item = configure_roi_item(
                 roi_item, fmt, lbl, editable, option=self.roi.PREFIX
             )
-            item.setTitle(single_roi.title or f"ROI{index:02d}")
+            item.setTitle(single_roi.title or get_generic_roi_title(index))
             yield item
 
 

datalab/gui/panel/base.py

@@ -47,7 +47,7 @@
     TypeROI,
     create_signal,
 )
-from sigima.objects.base import ROI_KEY
+from sigima.objects.base import ROI_KEY, get_obj_roi_title
 
 from datalab import objectmodel
 from datalab.adapters_plotpy.base import items_to_json
@@ -257,8 +257,10 @@ def create_resultdata_dict(
             for i_row_res in range(result.array.shape[0]):
                 ylabel = f"{result.title}({get_short_id(obj)})"
                 i_roi = int(result.array[i_row_res, 0])
+                roititle = ""
                 if i_roi >= 0:
-                    ylabel += f"|ROI{i_roi}"
+                    roititle = get_obj_roi_title(obj, i_roi)
+                    ylabel += f"|{roititle}"
                 rdata.ylabels.append(ylabel)
     return rdatadict
 
@@ -1593,8 +1595,9 @@ class PlotResultParam(gds.DataSet):
                     ),
                 )
                 return
+            obj = objs[0]
             for i_roi in all_roi_indexes[0]:
-                roi_suffix = f"|ROI{int(i_roi + 1)}" if i_roi >= 0 else ""
+                roi_suffix = ""
                 for title, results in grouped_results.items():  # title
                     x, y = [], []
                     for index, result in enumerate(results):
@@ -1605,6 +1608,8 @@ class PlotResultParam(gds.DataSet):
                             i_xaxis = rdata.xlabels.index(param.xaxis)
                             x.append(result.shown_array[mask, i_xaxis][0])
                         y.append(result.shown_array[mask, i_yaxis][0])
+                    if i_roi >= 0:
+                        roi_suffix = f"|{get_obj_roi_title(obj, i_roi)}"
                     self.__add_result_signal(
                         x, y, f"{title}{roi_suffix}", param.xaxis, param.yaxis
                     )
@@ -1613,17 +1618,20 @@ class PlotResultParam(gds.DataSet):
             # ------------------------------------------------------------------
             for title, results in grouped_results.items():  # title
                 for index, result in enumerate(results):  # object
+                    obj = objs[index]
                     roi_idx = np.array(np.unique(result.array[:, 0]), dtype=int)
                     for i_roi in roi_idx:  # ROI
-                        roi_suffix = f"|ROI{int(i_roi + 1)}" if i_roi >= 0 else ""
+                        roi_suffix = ""
+                        if i_roi >= 0:
+                            roi_suffix = f"|{get_obj_roi_title(obj, i_roi)}"
                         mask = result.array[:, 0] == i_roi
                         if param.xaxis == "indices":
                             x = np.arange(result.array.shape[0])[mask]
                         else:
                             i_xaxis = rdata.xlabels.index(param.xaxis)
                             x = result.shown_array[mask, i_xaxis]
                         y = result.shown_array[mask, i_yaxis]
-                        shid = get_short_id(objs[index])
+                        shid = get_short_id(obj)
                         stitle = f"{title} ({shid}){roi_suffix}"
                         self.__add_result_signal(x, y, stitle, param.xaxis, param.yaxis)
 

datalab/gui/processor/base.py

@@ -25,6 +25,7 @@
 from qtpy import QtWidgets as QW
 from sigima.config import options as sigima_options
 from sigima.objects import ImageObj, SignalObj, TypeROI, TypeROIParam
+from sigima.objects.base import get_obj_roi_title
 from sigima.proc.decorator import is_computation_function
 
 from datalab import env
@@ -695,16 +696,16 @@ def compute_1_to_0(
                     obj.metadata[f"{result.title}Param"] = str(param)
 
                 results[get_uuid(obj)] = result
-                xlabels = result.headers
                 if obj is current_obj:
                     self.panel.selection_changed(update_items=True)
                 else:
                     self.panel.refresh_plot(get_uuid(obj), True, False)
+                xlabels = result.headers
                 for i_row_res in range(result.array.shape[0]):
                     ylabel = f"{result.title}({get_short_id(obj)})"
                     i_roi = int(result.array[i_row_res, 0])
                     if i_roi >= 0:
-                        ylabel += f"|ROI{i_roi}"
+                        ylabel += f"|{get_obj_roi_title(obj, i_roi)}"
                     ylabels.append(ylabel)
         if results:
             with warnings.catch_warnings():

datalab/gui/roieditor.py

@@ -56,6 +56,7 @@
     TypeObj,
     TypeROI,
 )
+from sigima.objects.base import get_generic_roi_title
 
 from datalab.adapters_plotpy import (
     TypePlotItem,
@@ -87,7 +88,9 @@ def tool_deselect_items(tool: InteractiveTool) -> None:
 
 
 def tool_setup_shape(
-    plot: BasePlot, shape: TypeROIItem, obj: SignalObj | ImageObj
+    plot: BasePlot,
+    shape: TypeROIItem,
+    obj: SignalObj | ImageObj,
 ) -> None:
     """Tool setup shape"""
     configure_roi_item_in_tool(shape, obj)
@@ -97,7 +100,7 @@ def tool_setup_shape(
         match = re.match(r"ROI(\d+)", name)
         if match is not None:
             max_index = max(max_index, int(match.group(1)))
-    shape.setTitle(f"ROI{max_index + 1:02d}")
+    shape.setTitle(get_generic_roi_title(max_index + 1))
 
 
 class ROISegmentTool(HRangeTool):