CellProfiler-nightly 5.0.0.dev509__tar.gz → 5.0.0.dev514__tar.gz

{cellprofiler_nightly-5.0.0.dev509 → cellprofiler_nightly-5.0.0.dev514}/CellProfiler_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CellProfiler-nightly
-Version: 5.0.0.dev509
+Version: 5.0.0.dev514
 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.dev509 → cellprofiler_nightly-5.0.0.dev514}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CellProfiler-nightly
-Version: 5.0.0.dev509
+Version: 5.0.0.dev514
 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.dev509 → cellprofiler_nightly-5.0.0.dev514}/cellprofiler/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '5.0.0.dev509'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev509')
+__version__ = version = '5.0.0.dev514'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev514')
 
-__commit_id__ = commit_id = 'gc5c07ce88'
+__commit_id__ = commit_id = 'g5b9c361fc'

{cellprofiler_nightly-5.0.0.dev509 → cellprofiler_nightly-5.0.0.dev514}/cellprofiler/gui/figure/_figure.py

@@ -42,6 +42,7 @@ from cellprofiler_core.preferences import get_secondary_outline_color
 from cellprofiler_core.preferences import get_tertiary_outline_color
 from cellprofiler_core.preferences import get_title_font_name
 from cellprofiler_core.preferences import get_title_font_size
+from cellprofiler_core.preferences import get_table_font_name
 from cellprofiler_core.utilities.core.object import overlay_labels
 
 from ._navigation_toolbar import NavigationToolbar
@@ -2226,6 +2227,22 @@ class Figure(wx.Frame):
         nrows = len(statistics)
         ncols = 0 if nrows == 0 else len(statistics[0])
         ctrl.CreateGrid(nrows, ncols)
+        table_cell_font = wx.Font(
+            ctrl.Font.GetPointSize(),
+            ctrl.Font.GetFamily(),
+            ctrl.Font.GetStyle(),
+            wx.FONTWEIGHT_NORMAL,
+            faceName=get_table_font_name(),
+        )
+        table_label_font = wx.Font(
+            ctrl.Font.GetPointSize(),
+            ctrl.Font.GetFamily(),
+            ctrl.Font.GetStyle(),
+            wx.FONTWEIGHT_BOLD,
+            faceName=get_table_font_name(),
+        )
+        ctrl.SetLabelFont(table_label_font)
+        ctrl.SetDefaultCellFont(table_cell_font)
         if col_labels is not None:
             for i, value in enumerate(col_labels):
                 ctrl.SetColLabelValue(i, str(value))

{cellprofiler_nightly-5.0.0.dev509 → cellprofiler_nightly-5.0.0.dev514}/cellprofiler/modules/measuregranularity.py

@@ -262,20 +262,6 @@ class MeasureGranularity(Module):
             title="If individual objects were measured, use an Export module to view their results",
         )
 
-    def add_names_to_measurements(self, measurements_arr, image_measurements_arr, statistics, image_name, granular_spectrum_length):
-        _statistics = [image_name] + statistics
-        _measurements_arr = []
-        _image_measurements_arr = []
-        ng = granular_spectrum_length
-        for i in range(1, ng+1):
-            feature = TemplateMeasurementFormat.GRANULARITY % (i, image_name)
-            _image_measurements_arr += [(feature, image_measurements_arr[i-1])]
-            if i < len(measurements_arr):
-                if measurements_arr[i-1]:
-                    for (obj_name, obj_gss) in measurements_arr[i-1]:
-                        _measurements_arr += [(obj_name, feature, obj_gss)]
-                        # _measurements_arr += [(measurements_arr[i-1][j][0], feature, measurements_arr[i-1][j][1])]
-        return _measurements_arr, _image_measurements_arr, _statistics
 
     def run_on_image_setting(self, workspace, image_name):
         im = workspace.image_set.get_image(image_name, must_be_grayscale=True)
@@ -288,10 +274,10 @@ class MeasureGranularity(Module):
             ObjectRecord(objects_name, workspace.object_set.get_objects(objects_name).segmented, im_mask, im_pixel_data) for objects_name in self.objects_list.value
         ]
         granular_spectrum_length = self.granular_spectrum_length.value
-        image_name = image_name
         dimensions = im.dimensions
 
-        measurements_arr, image_measurements_arr, statistics = measure_granularity(
+        measurements, summary = measure_granularity(
+            image_name,
             im_pixel_data, 
             im_mask, 
             subsample_size, 
@@ -301,14 +287,17 @@ class MeasureGranularity(Module):
             granular_spectrum_length, 
             dimensions
         )
-        measurements_arr, image_measurements_arr, statistics = self.add_names_to_measurements(measurements_arr, image_measurements_arr, statistics, image_name, granular_spectrum_length)
-
-        for packed_measurements in measurements_arr:
-            workspace.measurements.add_measurement(*packed_measurements)
-        for packed_measurements in image_measurements_arr:
-            workspace.measurements.add_image_measurement(*packed_measurements)
-
-        return statistics
+        
+        # Record Image Measurements
+        for feature_name, value in measurements.image.items():
+            workspace.measurements.add_image_measurement(feature_name, value)
+            
+        # Record Object Measurements
+        for object_name, features in measurements.objects.items():
+            for feature_name, values in features.items():
+                workspace.measurements.add_measurement(object_name, feature_name, values)
+
+        return summary
 
     def get_measurement_columns(self, pipeline, return_sources=False):
         result = []