celldetective 1.3.9__py3-none-any.whl → 1.3.9.post2__py3-none-any.whl

celldetective/_version.py

@@ -1 +1 @@
-__version__ = "1.3.9"
+__version__ = "1.3.9.post2"

celldetective/gui/processes/measure_cells.py

@@ -193,17 +193,20 @@ class MeasurementProcess(Process):
 		# Load trajectories, add centroid if not in trajectory
 		self.trajectories = self.pos+os.sep.join(['output','tables', self.table_name])
 		if os.path.exists(self.trajectories):
-			print('trajectory exists...')
+			print('Previous table detected...')
 			self.trajectories = pd.read_csv(self.trajectories)
 			if 'TRACK_ID' not in list(self.trajectories.columns):
+				print('Non-tracked cells detected...')
 				self.do_iso_intensities = False
 				self.intensity_measurement_radii = None
 				if self.clear_previous:
-					print('No TRACK_ID... Clear previous measurements...')
+					print('Clear previous measurements...')
 					self.trajectories = None #remove_trajectory_measurements(trajectories, column_labels)
 					self.do_features = True
 					self.features += ['centroid']
+				self.column_labels.update({'track': 'ID'})
 			else:
+				print('Tracked cells detected...')
 				if self.clear_previous:
 					print('TRACK_ID found... Clear previous measurements...')
 					self.trajectories = remove_trajectory_measurements(self.trajectories, self.column_labels)

celldetective/utils.py

@@ -31,7 +31,7 @@ from scipy.stats import ks_2samp
 from cliffs_delta import cliffs_delta
 from stardist.models import StarDist2D
 from cellpose.models import CellposeModel
-from pathlib import PosixPath, PurePosixPath
+from pathlib import PosixPath, PurePosixPath, WindowsPath
 
 def get_config(experiment):
 
@@ -68,7 +68,7 @@ def get_config(experiment):
 
 	"""
 
-	if isinstance(experiment, (PosixPath, PurePosixPath)):
+	if isinstance(experiment, (PosixPath, PurePosixPath, WindowsPath)):
 		experiment = str(experiment)
 
 	if not experiment.endswith(os.sep):

{celldetective-1.3.9.dist-info → celldetective-1.3.9.post2.dist-info}/METADATA

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

{celldetective-1.3.9.dist-info → celldetective-1.3.9.post2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 celldetective/__init__.py,sha256=bi3SGTMo6s2qQBsJAaKy-a4xaGcTQVW8zsqaiX5XKeY,139
 celldetective/__main__.py,sha256=bxTlSvbKhqn3LW_azd2baDCnDsgb37PAP9DfuAJ1_5M,1844
-celldetective/_version.py,sha256=SaWgUI6v92kVfF_Qdoxbfc38bwA34RuDGZmXMqa5g3c,22
+celldetective/_version.py,sha256=-L_OTdOS0yLx8w7SqORxWfMGshbo1ITN75NdQT0lis0,28
 celldetective/events.py,sha256=UkjY_-THo6WviWWCLnDbma7jWOd_O9a60C4IOX2htG8,8254
 celldetective/extra_properties.py,sha256=PUs-lltSj_jSko_Gd-w483OxZW6oR3BAHQrw51DUxMg,8081
 celldetective/filters.py,sha256=6pl2IGPK2FH8KPWbjzQEbT4C-ruqE1fQ8NQNN7Euvy8,4433
@@ -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=RoNkCGCs9V3EiIn63N20qNKBQ_-H9bogF5LgByQ2UZo,106316
+celldetective/utils.py,sha256=RzC5yzuspnqF0_FG20mFTlrvPR2l5tpW0fyL32JccqY,106342
 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
@@ -56,7 +56,7 @@ celldetective/gui/help/propagate-classification.json,sha256=F7Ir1mtgRVTXWLN7n3ny
 celldetective/gui/help/track-postprocessing.json,sha256=VaGd8EEkA33OL-EI3NXWZ8yHeWWyUeImDF5yAjsVYGA,3990
 celldetective/gui/help/tracking.json,sha256=yIAoOToqCSQ_XF4gwEZCcyXcvQ3mROju263ZPDvlUyY,776
 celldetective/gui/processes/downloader.py,sha256=SuMTuM82QOZBqLfj36I14fhZ2k3NmLp0PBcGUHxnpXI,3287
-celldetective/gui/processes/measure_cells.py,sha256=MLkVLLuUtVVgwQB9a9N8eZ5TzF-Xtuhzb5wtcFRa1lU,12846
+celldetective/gui/processes/measure_cells.py,sha256=gnUJzvmLt7hMpGVoqlBayv8ibdu9tvKaFbON_BE7NH0,12966
 celldetective/gui/processes/segment_cells.py,sha256=49Bh3nejkrxlLNhlP3Y_6-flkBOhkqFMQmrc2qDj7Dk,11320
 celldetective/gui/processes/track_cells.py,sha256=y8ohHAMcGtAjrJOP1WqvDfy_K85LbmdXoN7CA7BYpaY,9942
 celldetective/gui/processes/train_segmentation_model.py,sha256=bvcPG19hBjhNY9hd6Ch5_wk2FOJYQg97Azoz4RKeP-0,10776
@@ -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.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-celldetective-1.3.9.dist-info/METADATA,sha256=POcWapSbuacLCmplgT1JURcBQIQ25jNSigcN5ltnx5s,10747
-celldetective-1.3.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-celldetective-1.3.9.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
-celldetective-1.3.9.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
-celldetective-1.3.9.dist-info/RECORD,,
+celldetective-1.3.9.post2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+celldetective-1.3.9.post2.dist-info/METADATA,sha256=32q8-6ZVwiHP3ScLNJ4NKCuyZFQp-WjNdGE_Z6HuOHk,10753
+celldetective-1.3.9.post2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+celldetective-1.3.9.post2.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
+celldetective-1.3.9.post2.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
+celldetective-1.3.9.post2.dist-info/RECORD,,