CellProfiler-nightly 5.0.0.dev728__tar.gz → 5.0.0.dev737__tar.gz

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/CellProfiler_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CellProfiler-nightly
-Version: 5.0.0.dev728
+Version: 5.0.0.dev737
 Summary: CellProfiler is a free open-source software designed to enable biologists without training in computer vision or programming to quantitatively measure phenotypes from thousands of images automatically.
 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_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/CellProfiler_nightly.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "5.0.0.dev0",
-  "distance": 728,
-  "node": "gf66c883bd90c65d71095cd85bea58cc7c6b092e1",
+  "distance": 737,
+  "node": "gcb2ef7a2c2bff190d85bff9aaae1b000385e32fb",
   "dirty": true,
   "branch": "main",
   "node_date": "2026-09-28"

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CellProfiler-nightly
-Version: 5.0.0.dev728
+Version: 5.0.0.dev737
 Summary: CellProfiler is a free open-source software designed to enable biologists without training in computer vision or programming to quantitatively measure phenotypes from thousands of images automatically.
 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_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/cellprofiler/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '5.0.0.dev728'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev728')
+__version__ = version = '5.0.0.dev737'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev737')
 
-__commit_id__ = commit_id = 'gf66c883bd'
+__commit_id__ = commit_id = 'gcb2ef7a2c'

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/cellprofiler/modules/measurecolocalization.py

@@ -98,7 +98,7 @@ from cellprofiler_library.functions.image_processing import apply_threshold_to_o
 import cellprofiler_library.opts.threshold as Threshold
 from cellprofiler_library.opts.measurecolocalization import MeasurementType, TemplateMeasurementFormat, Target, CostesMethod
 from cellprofiler_library.modules._measurecolocalization import run_image_pair_images, run_image_pair_objects, crop_image_pair_similarly, crop_image_pair_and_object_similarly
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 # The number of settings per threshold
 THRESHOLD_SETTING_COUNT = 2

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/cellprofiler/modules/measureimageareaoccupied.py

@@ -52,9 +52,9 @@ from cellprofiler_core.setting.subscriber import (
     ImageListSubscriber,
     LabelListSubscriber,
 )
+from cellprofiler_core.utilities.core.workspace import add_library_measurements_to_workspace_measurements
 from cellprofiler_library.modules._measureimageareaoccupied import measure_image_area_perimeter, measure_objects_area_perimeter
 from cellprofiler_library.opts.measureimageareaoccupied import MeasurementType, Target, C_AREA_OCCUPIED
-from cellprofiler_library.measurement_model import LibraryMeasurements
 # The number of settings per image or object group
 IMAGE_SETTING_COUNT = 1
 
@@ -156,7 +156,9 @@ Select the previously identified objects you would like to measure.""".format(
                     pipeline_volumetric, 
                     return_visualization_data=True,
                     )
-                add_library_measurements_to_workspace(_lib_measurements, workspace)
+                add_library_measurements_to_workspace_measurements(
+                    workspace.measurements, _lib_measurements, module_num=self.module_num,
+                )
                 statistics += _lib_display.statistics
         if self.operand_choice.value in (Target.BOTH, Target.OBJECTS):
             if len(self.objects_list.value) == 0:
@@ -177,7 +179,9 @@ Select the previously identified objects you would like to measure.""".format(
                     pipeline_volumetric, 
                     return_visualization_data=True,
                 )
-                add_library_measurements_to_workspace(_lib_measurements, workspace)
+                add_library_measurements_to_workspace_measurements(
+                    workspace.measurements, _lib_measurements, module_num=self.module_num,
+                )
                 statistics += _lib_display.statistics
 
         if self.show_window:
@@ -353,27 +357,3 @@ Select the previously identified objects you would like to measure.""".format(
 
     def volumetric(self):
         return True
-
-
-def add_library_measurements_to_workspace(library_measurements: LibraryMeasurements, workspace):
-    """Add the library measurements to the workspace
-
-    library_measurements - the library measurements to be added
-    workspace - the workspace to which the measurements will be added
-    """
-    #
-    # Record the measurements
-    #
-    # assume isinstance(workspace, Workspace)
-    m = workspace.measurements
-    # assume isinstance(m, Measurements)
-    
-    # Record Image Measurements
-    for feature_name, value in library_measurements.image.items():
-        m.add_image_measurement(feature_name, value)
-    
-    # Record Object Measurements
-    for object_name, features in library_measurements.objects.items():
-        for feature_name, data in features.items():
-            m.add_measurement(object_name, feature_name, data)
-

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/cellprofiler/modules/measureobjectneighbors.py

@@ -84,7 +84,7 @@ from cellprofiler_core.workspace import Workspace
 from cellprofiler_library.opts.measureobjectneighbors import DistanceMethod, Measurement, MeasurementScale, C_NEIGHBORS, M_ALL, D_ALL
 from cellprofiler_library.types import ObjectSegmentation
 from cellprofiler_library.modules._measureobjectneighbors import measure_object_neighbors
-from cellprofiler_library.measurement_model import (
+from cellprofiler_library.measurements.measurement_model import (
     R_FIRST_OBJECT_NUMBER,
     R_SECOND_OBJECT_NUMBER,
 )

{cellprofiler_nightly-5.0.0.dev728 → cellprofiler_nightly-5.0.0.dev737}/cellprofiler/modules/relateobjects.py

@@ -27,7 +27,7 @@ from cellprofiler_library.modules._relateobjects import (
     relate_objects,
     should_aggregate_feature as _should_aggregate_feature,
 )
-from cellprofiler_library.measurement_model import (
+from cellprofiler_library.measurements.measurement_model import (
     R_FIRST_OBJECT_NUMBER,
     R_SECOND_OBJECT_NUMBER,
 )