Fixes #6: unexpected multiple ROI extraction behavior with single ROI

Author: PierreRaybaut

CHANGELOG.md

@@ -3,6 +3,17 @@
 See DataLab [roadmap page](https://cdlapp.readthedocs.io/en/latest/dev/roadmap.html)
 for future and past milestones.
 
+## DataLab Version 0.9.2 ##
+
+🛠️ Bug fixes:
+
+* Region of interest (ROI) extraction feature for images:
+  * ROI extraction was not working properly when the "Extract all regions of interest
+    into a single image object" option was enabled if there was only one defined ROI
+  * The result was an image positioned at the origin (0, 0) instead of the expected
+    position (x0, y0) and the ROI rectangle itself was not removed as expected
+  * [Issue #6](https://github.com/Codra-Ingenierie-Informatique/DataLab/issues/6) - 'Extract multiple ROI' feature: unexpected result for a single ROI
+
 ## DataLab Version 0.9.1 ##
 
 🛠️ Bug fixes:

cdl/core/computation/image/__init__.py

@@ -527,11 +527,18 @@ def extract_multiple_roi(src: ImageObj, group: gds.DataSetGroup) -> ImageObj:
     Returns:
         ImageObj: output image object
     """
+    x0 = min(p.x0 for p in group.datasets)
+    y0 = min(p.y0 for p in group.datasets)
+    x1 = max(p.x1 for p in group.datasets)
+    y1 = max(p.y1 for p in group.datasets)
     suffix = None
     if len(group.datasets) == 1:
         p = group.datasets[0]
         suffix = p.get_suffix()
     dst = dst_11(src, "extract_multiple_roi", suffix)
+    dst.x0 += x0
+    dst.y0 += y0
+    dst.roi = None
     if len(group.datasets) == 1:
         p = group.datasets[0]
         dst.data = src.data.copy()[p.y0 : p.y1, p.x0 : p.x1]
@@ -540,14 +547,7 @@ def extract_multiple_roi(src: ImageObj, group: gds.DataSetGroup) -> ImageObj:
     for p in group.datasets:
         slice1, slice2 = slice(p.y0, p.y1 + 1), slice(p.x0, p.x1 + 1)
         out[slice1, slice2] = src.data[slice1, slice2]
-    x0 = min(p.x0 for p in group.datasets)
-    y0 = min(p.y0 for p in group.datasets)
-    x1 = max(p.x1 for p in group.datasets)
-    y1 = max(p.y1 for p in group.datasets)
     dst.data = out[y0:y1, x0:x1]
-    dst.x0 += min(p.x0 for p in group.datasets)
-    dst.y0 += min(p.y0 for p in group.datasets)
-    dst.roi = None
     return dst