cellprofiler-core-nightly 5.0.0.dev610__tar.gz → 5.0.0.dev625__tar.gz

{cellprofiler_core_nightly-5.0.0.dev610 → cellprofiler_core_nightly-5.0.0.dev625}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-core-nightly
-Version: 5.0.0.dev610
+Version: 5.0.0.dev625
 Summary: cellprofiler-core implements the bulk of CellProfiler's non-gui functionality
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_core_nightly-5.0.0.dev610 → cellprofiler_core_nightly-5.0.0.dev625}/cellprofiler_core/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '5.0.0.dev610'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev610')
+__version__ = version = '5.0.0.dev625'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev625')
 
-__commit_id__ = commit_id = 'g53b2372ff'
+__commit_id__ = commit_id = 'g36602cded'

{cellprofiler_core_nightly-5.0.0.dev610 → cellprofiler_core_nightly-5.0.0.dev625}/cellprofiler_core/utilities/core/object.py

@@ -4,6 +4,7 @@ import skimage.color
 
 from ...preferences import get_default_colormap
 from cellprofiler_library.functions.object_processing import size_similarly as _size_similarly
+from cellprofiler_library.functions.object_processing import crop_labels_and_image as _crop_labels_and_image
 
 def crop_labels_and_image(labels, image):
     """Crop a labels matrix and an image to the lowest common size
@@ -13,27 +14,7 @@ def crop_labels_and_image(labels, image):
 
     Assumes that points outside of the common boundary should be masked.
     """
-    min_dim1 = min(labels.shape[0], image.shape[0])
-    min_dim2 = min(labels.shape[1], image.shape[1])
-
-    if labels.ndim == 3:  # volume
-        min_dim3 = min(labels.shape[2], image.shape[2])
-
-        if image.ndim == 4:  # multichannel volume
-            return (
-                labels[:min_dim1, :min_dim2, :min_dim3],
-                image[:min_dim1, :min_dim2, :min_dim3, :],
-            )
-
-        return (
-            labels[:min_dim1, :min_dim2, :min_dim3],
-            image[:min_dim1, :min_dim2, :min_dim3],
-        )
-
-    if image.ndim == 3:  # multichannel image
-        return labels[:min_dim1, :min_dim2], image[:min_dim1, :min_dim2, :]
-
-    return labels[:min_dim1, :min_dim2], image[:min_dim1, :min_dim2]
+    return _crop_labels_and_image(labels, image)
 
 
 def size_similarly(labels, secondary):

{cellprofiler_core_nightly-5.0.0.dev610 → cellprofiler_core_nightly-5.0.0.dev625}/cellprofiler_core_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-core-nightly
-Version: 5.0.0.dev610
+Version: 5.0.0.dev625
 Summary: cellprofiler-core implements the bulk of CellProfiler's non-gui functionality
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>