Merge pull request #241 from clEsperanto/update-clic-0.13.1

Update to [email protected]

pyclesperanto/_tier5.py

@@ -191,4 +191,37 @@ def filter_label_by_size(
     ----------
     [1] https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange
     """
-    return clic._filter_label_by_size(device, input_image, output_image, float(min_size), float(max_size))
+    return clic._filter_label_by_size(device, input_image, output_image, float(min_size), float(max_size))
+
+@plugin_function(categories=["label processing", "in assistant"])
+def exclude_labels_outside_size_range(
+    input_image: Image,
+    output_image: Optional[Image] =None,
+    min_size: float =0,
+    max_size: float =100,
+    device: Optional[Device] =None
+) -> Image:
+    """Filter labelled objects outside of the min/max size range value.
+
+    Parameters
+    ----------
+    input_image: Image 
+        Input label image.
+    output_image: Optional[Image] (= None)
+        Output label image.
+    min_size: float (= 0)
+        Minimum size of labels to keep.
+    max_size: float (= 100)
+        Maximum size of labels to keep.
+    device: Optional[Device] (= None)
+        Device to perform the operation on.
+
+    Returns
+    -------
+    Image
+
+    References
+    ----------
+    [1] https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange
+    """
+    return clic._exclude_labels_outside_size_range(device, input_image, output_image, float(min_size), float(max_size))

pyclesperanto/_tier7.py

@@ -388,35 +388,4 @@ def voronoi_otsu_labeling(
     [2] https://ieeexplore.ieee.org/document/4310076
     [3] https://en.wikipedia.org/wiki/Voronoi_diagram
     """
-    return clic._voronoi_otsu_labeling(device, input_image, output_image, float(spot_sigma), float(outline_sigma))
-
-@plugin_function(categories=["label processing", "in assistant", "bia-bob-suggestion"])
-def fill_holes(
-    input_image: Image,
-    output_image: Optional[Image] =None,
-    max_size: float =100,
-    device: Optional[Device] =None
-) -> Image:
-    """Fill holes in labelled objects samller than a given size (in pixels) from a
-    label map.
-
-    Parameters
-    ----------
-    input_image: Image 
-        Label image to filter.
-    output_image: Optional[Image] (= None)
-        Output label image fitlered.
-    max_size: float (= 100)
-        Biggest size holes allowed.
-    device: Optional[Device] (= None)
-        Device to perform the operation on.
-
-    Returns
-    -------
-    Image
-
-    References
-    ----------
-    [1] https://clij.github.io/clij2-docs/reference_excludeLabelsOutsideSizeRange
-    """
-    return clic._fill_holes(device, input_image, output_image, float(max_size))
+    return clic._voronoi_otsu_labeling(device, input_image, output_image, float(spot_sigma), float(outline_sigma))

pyclesperanto/_version.py

@@ -1,3 +1,3 @@
-VERSION = "0.12.1"
-CLIC_VERSION = "0.13.0"
+VERSION = "0.13.1"
+CLIC_VERSION = "0.13.1"
 COMMON_ALIAS = "cle"

src/wrapper/tier5_.cpp

@@ -29,4 +29,8 @@ m.def("_array_equal", &cle::tier5::array_equal_func, "Call cle::tier5::array_equ
     m.def("_filter_label_by_size", &cle::tier5::filter_label_by_size_func, "Call cle::tier5::filter_label_by_size_func from C++ CLIc.",
     py::return_value_policy::take_ownership,
     py::arg("device"), py::arg("src"), py::arg("dst"), py::arg("min_size"), py::arg("max_size"));
+
+    m.def("_exclude_labels_outside_size_range", &cle::tier5::exclude_labels_outside_size_range_func, "Call cle::tier5::exclude_labels_outside_size_range_func from C++ CLIc.",
+    py::return_value_policy::take_ownership,
+    py::arg("device"), py::arg("src"), py::arg("dst"), py::arg("min_size"), py::arg("max_size"));
 }

src/wrapper/tier7_.cpp

@@ -45,8 +45,4 @@ m.def("_affine_transform", &cle::tier7::affine_transform_func, "Call cle::tier7:
     m.def("_voronoi_otsu_labeling", &cle::tier7::voronoi_otsu_labeling_func, "Call cle::tier7::voronoi_otsu_labeling_func from C++ CLIc.",
     py::return_value_policy::take_ownership,
     py::arg("device"), py::arg("src"), py::arg("dst"), py::arg("spot_sigma"), py::arg("outline_sigma"));
-
-    m.def("_fill_holes", &cle::tier7::fill_holes_func, "Call cle::tier7::fill_holes_func from C++ CLIc.",
-    py::return_value_policy::take_ownership,
-    py::arg("device"), py::arg("src"), py::arg("dst"), py::arg("max_size"));
 }