celldetective 1.3.9.post3__py3-none-any.whl → 1.3.9.post4__py3-none-any.whl

celldetective/_version.py

@@ -1 +1 @@
-__version__ = "1.3.9.post3"
+__version__ = "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/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/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.dist-info → celldetective-1.3.9.post4.dist-info}/METADATA

@@ -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.dist-info → celldetective-1.3.9.post4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 celldetective/__init__.py,sha256=bi3SGTMo6s2qQBsJAaKy-a4xaGcTQVW8zsqaiX5XKeY,139
 celldetective/__main__.py,sha256=bxTlSvbKhqn3LW_azd2baDCnDsgb37PAP9DfuAJ1_5M,1844
-celldetective/_version.py,sha256=7LdGJtBuAQ99wkn-0aLzi5WGP1RCrguzXtOTqLyM6m8,28
+celldetective/_version.py,sha256=-wBVuq0KoOI1lWnD4DhV-4xOLeDCprVOid1FqpG037I,28
 celldetective/events.py,sha256=UkjY_-THo6WviWWCLnDbma7jWOd_O9a60C4IOX2htG8,8254
-celldetective/extra_properties.py,sha256=nP_EX2yxJuZRP283uYzN8km-_uOfW94u0zD_K2bIub8,8689
+celldetective/extra_properties.py,sha256=LRJ1SRp9dvH_tpSEYv25wJFvaSg-95jFpzKLZwWvA3I,8689
 celldetective/filters.py,sha256=6pl2IGPK2FH8KPWbjzQEbT4C-ruqE1fQ8NQNN7Euvy8,4433
 celldetective/io.py,sha256=KDb1N7ccUAUXKE2NHo9TIC7A5u2A9wYieGteoa0ymN0,121754
 celldetective/measure.py,sha256=h1F08Vf7sy-20syMFZTUl1lHzE4h6cQvswJpwD9fcfE,58475
@@ -12,7 +12,7 @@ celldetective/relative_measurements.py,sha256=-GWig0lC5UWAcJSPlo9Sp45khGj80fxuQf
 celldetective/segmentation.py,sha256=WApzoU1s3Ntvp0eIw_pRZXNwCA8LDKC9YoyR52tioz4,30943
 celldetective/signals.py,sha256=nMyyGUpla8D2sUYKY1zjbWsAueVPI_gUalY0KXfWteI,111595
 celldetective/tracking.py,sha256=VBJLd-1EeJarOVPBNEomhVBh9UYAMdSnH0tmUiUoTrY,40242
-celldetective/utils.py,sha256=0LENOCxNMuEmClLiyvo_jIO2as4i7a5bMk1NaXUhgVs,104430
+celldetective/utils.py,sha256=u9mvb4ajP4eE_usnkz9fBxkVOLrd2HfuPPE9FgAhTbc,104404
 celldetective/datasets/segmentation_annotations/blank,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 celldetective/datasets/signal_annotations/blank,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 celldetective/gui/InitWindow.py,sha256=TPKWYczhPHvPKWg654sXnE9xCEx6U-oWX0_OJgLTWbU,15044
@@ -99,7 +99,7 @@ celldetective/models/tracking_configs/no_z_motion.json,sha256=b4RWOJ0w6Y2e0vJYwK
 celldetective/models/tracking_configs/ricm.json,sha256=L-vmwCR1f89U-qnH2Ms0cBfPFR_dxIWoe2ccH8V-QBA,2727
 celldetective/models/tracking_configs/ricm2.json,sha256=DDjJ6ScYcDWvlsy7ujPID8v8H28vcNcMuZmNR8XmGxo,2718
 celldetective/regionprops/__init__.py,sha256=ohe9vC7j4lnpKnGXidVo1PVfoQfC8TqCuHTNo8rXmdg,44
-celldetective/regionprops/_regionprops.py,sha256=5pxet-E2Eg6bSs7n0xjknDPQr15G14nUAqPRfDffzz0,10042
+celldetective/regionprops/_regionprops.py,sha256=a68bAytxgy-WFUzrjWg-xViSE27ehN9PdKfyO-dxKxM,10275
 celldetective/regionprops/props.json,sha256=sCwACmbh0n-JAw9eve9yV85REukoMBJLsRjxCwTRMm8,2424
 celldetective/scripts/analyze_signals.py,sha256=YE05wZujl2hQFWkvqATBcCx-cAd_V3RxnvKoh0SB7To,2194
 celldetective/scripts/measure_cells.py,sha256=edZ9xlUsLg1TI_yudp7bd04B_oqdHk9Ee4mSDe8G86w,11769
@@ -121,9 +121,9 @@ tests/test_segmentation.py,sha256=k1b_zIZdlytEdJcHjAUQEO3gTBAHtv5WvrwQN2xD4kc,34
 tests/test_signals.py,sha256=No4cah6KxplhDcKXnU8RrA7eDla4hWw6ccf7xGnBokU,3599
 tests/test_tracking.py,sha256=8hebWSqEIuttD1ABn-6dKCT7EXKRR7-4RwyFWi1WPFo,8800
 tests/test_utils.py,sha256=NKRCAC1d89aBK5cWjTb7-pInYow901RrT-uBlIdz4KI,3692
-celldetective-1.3.9.post3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-celldetective-1.3.9.post3.dist-info/METADATA,sha256=IH5Ea7-lEKV8k_kgSYxLmxN9mB_IcncHnRExw5HSN5w,10753
-celldetective-1.3.9.post3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-celldetective-1.3.9.post3.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
-celldetective-1.3.9.post3.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
-celldetective-1.3.9.post3.dist-info/RECORD,,
+celldetective-1.3.9.post4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+celldetective-1.3.9.post4.dist-info/METADATA,sha256=_UdO696o0Et9eTWHRKOl6NSn8eC8puV1y1G25M8qCEU,10753
+celldetective-1.3.9.post4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+celldetective-1.3.9.post4.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
+celldetective-1.3.9.post4.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
+celldetective-1.3.9.post4.dist-info/RECORD,,