celldetective 1.3.9.post3__tar.gz → 1.3.9.post4__tar.gz

{celldetective-1.3.9.post3 → celldetective-1.3.9.post4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: celldetective
-Version: 1.3.9.post3
+Version: 1.3.9.post4
 Summary: description
 Home-page: http://github.com/remyeltorro/celldetective
 Author: Rémy Torro

celldetective-1.3.9.post4/celldetective/_version.py

@@ -0,0 +1 @@
+__version__ = "1.3.9.post4"

{celldetective-1.3.9.post3 → celldetective-1.3.9.post4}/celldetective/extra_properties.py

@@ -181,7 +181,7 @@ def intensity_nanmean(regionmask, intensity_image):
 	else:
 		return np.nanmean(intensity_image[regionmask])
 
-def intensity_centre_of_mass_displacement(regionmask, intensity_image):
+def intensity_center_of_mass_displacement(regionmask, intensity_image):
 
 	if np.any(intensity_image!=intensity_image):
 		intensity_image = interpolate_nan(intensity_image.copy())
@@ -211,7 +211,7 @@ def intensity_centre_of_mass_displacement(regionmask, intensity_image):
 		return np.nan, np.nan, np.nan, np.nan
 
 
-def intensity_centre_of_mass_displacement_edge(regionmask, intensity_image):
+def intensity_center_of_mass_displacement_edge(regionmask, intensity_image):
 
 	if np.any(intensity_image!=intensity_image):
 		intensity_image = interpolate_nan(intensity_image.copy())

{celldetective-1.3.9.post3 → celldetective-1.3.9.post4}/celldetective/regionprops/_regionprops.py

@@ -108,10 +108,17 @@ class CustomRegionProps(RegionProperties):
 								
 								idx = self.channel_names.index(default_channel)
 								res = func(self.image, self.image_intensity[..., idx])
-								len_output = len(res)
+								if isinstance(res, tuple):
+									len_output = len(res)
+								else:
+									len_output = 1
 
-								multichannel_list = [[np.nan]*len_output for c in range(len(self.channel_names))]
-								multichannel_list[idx] = res
+								if len_output > 1:
+									multichannel_list = [[np.nan]*len_output for c in range(len(self.channel_names))]
+									multichannel_list[idx] = res
+								else:
+									multichannel_list = [np.nan for c in range(len(self.channel_names))]
+									multichannel_list[idx] = res
 
 							else:
 								print(f'Warning... Channel required by custom measurement ({default_channel}) could not be found in your data...')

{celldetective-1.3.9.post3 → celldetective-1.3.9.post4}/celldetective/utils.py

@@ -1264,7 +1264,6 @@ def rename_intensity_column(df, channels):
 			if s.isdigit():
 				if int(s)<len(channel_names):
 					test_digit[j] = True
-		print(f"{test_digit=}")
 			
 		if np.any(test_digit):
 			index = int(sections[np.where(test_digit)[0]][-1])
@@ -1289,36 +1288,36 @@ def rename_intensity_column(df, channels):
 				new_name = np.delete(measure, -1)
 				new_name = '_'.join(list(new_name))
 				if 'edge' in intensity_cols[k]:
-					new_name = new_name.replace('centre_of_mass_displacement', "edge_centre_of_mass_displacement_in_px")
+					new_name = new_name.replace('center_of_mass_displacement', "edge_center_of_mass_displacement_in_px")
 				else:
-					new_name = new_name.replace('centre_of_mass', "centre_of_mass_displacement_in_px")
+					new_name = new_name.replace('center_of_mass', "center_of_mass_displacement_in_px")
 				to_rename.update({intensity_cols[k]: new_name.replace('-', '_')})
 			
 			elif sections[-2] == "1":
 				new_name = np.delete(measure, -1)
 				new_name = '_'.join(list(new_name))
 				if 'edge' in intensity_cols[k]:
-					new_name = new_name.replace('centre_of_mass_displacement', "edge_centre_of_mass_orientation")
+					new_name = new_name.replace('center_of_mass_displacement', "edge_center_of_mass_orientation")
 				else:
-					new_name = new_name.replace('centre_of_mass', "centre_of_mass_orientation")
+					new_name = new_name.replace('center_of_mass', "center_of_mass_orientation")
 				to_rename.update({intensity_cols[k]: new_name.replace('-', '_')})
 				
 			elif sections[-2] == "2":
 				new_name = np.delete(measure, -1)
 				new_name = '_'.join(list(new_name))
 				if 'edge' in intensity_cols[k]:
-					new_name = new_name.replace('centre_of_mass_displacement', "edge_centre_of_mass_x")
+					new_name = new_name.replace('center_of_mass_displacement', "edge_center_of_mass_x")
 				else:
-					new_name = new_name.replace('centre_of_mass', "centre_of_mass_x")
+					new_name = new_name.replace('center_of_mass', "center_of_mass_x")
 				to_rename.update({intensity_cols[k]: new_name.replace('-', '_')})
 			
 			elif sections[-2] == "3":
 				new_name = np.delete(measure, -1)
 				new_name = '_'.join(list(new_name))
 				if 'edge' in intensity_cols[k]:
-					new_name = new_name.replace('centre_of_mass_displacement', "edge_centre_of_mass_y")
+					new_name = new_name.replace('center_of_mass_displacement', "edge_center_of_mass_y")
 				else:
-					new_name = new_name.replace('centre_of_mass', "centre_of_mass_y")
+					new_name = new_name.replace('center_of_mass', "center_of_mass_y")
 				to_rename.update({intensity_cols[k]: new_name.replace('-', '_')})
 		
 		if 'radial_gradient' in intensity_cols[k]:

{celldetective-1.3.9.post3 → celldetective-1.3.9.post4}/celldetective.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: celldetective
-Version: 1.3.9.post3
+Version: 1.3.9.post4
 Summary: description
 Home-page: http://github.com/remyeltorro/celldetective
 Author: Rémy Torro

celldetective-1.3.9.post3/celldetective/_version.py

@@ -1 +0,0 @@
-__version__ = "1.3.9.post3"