celldetective 1.3.3.post1__py3-none-any.whl → 1.3.4__py3-none-any.whl

celldetective/gui/plot_signals_ui.py

@@ -47,8 +47,8 @@ class ConfigSignalPlot(QWidget, Styles):
 		self.ax2=None
 		self.auto_close = False
 
-		self.well_option = self.parent_window.parent_window.well_list.currentIndex()
-		self.position_option = self.parent_window.parent_window.position_list.currentIndex()
+		self.well_option = self.parent_window.parent_window.well_list.getSelectedIndices()
+		self.position_option = self.parent_window.parent_window.position_list.getSelectedIndices()
 		self.interpret_pos_location()
 
 		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
@@ -67,15 +67,11 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		"""
 		
-		if self.well_option==len(self.wells):
-			self.well_indices = np.arange(len(self.wells))
-		else:
-			self.well_indices = np.array([self.well_option],dtype=int)
-
-		if self.position_option==0:
+		self.well_indices = self.parent_window.parent_window.well_list.getSelectedIndices()
+		self.position_indices = self.parent_window.parent_window.position_list.getSelectedIndices()
+		if not self.parent_window.parent_window.position_list.isAnySelected():
 			self.position_indices = None
-		else:
-			self.position_indices = np.array([self.position_option],dtype=int)
+
 
 	def populate_widget(self):
 
@@ -188,11 +184,21 @@ class ConfigSignalPlot(QWidget, Styles):
 		if 't0' in self.all_columns:
 			time_columns.append('t0')
 		
+		self.class_columns = np.unique(class_columns)
+		self.time_columns = np.unique(time_columns)
+		thresh = 18
+		self.class_truncated = [w[:thresh - 3]+'...' if len(w)>thresh else w for w in self.class_columns]
+		self.time_truncated = [w[:thresh - 3]+'...' if len(w)>thresh else w for w in self.time_columns]
+
 		self.cbs[2].clear()
-		self.cbs[2].addItems(np.unique(self.cb_options[2]+time_columns))
+		self.cbs[2].addItems(self.time_truncated)
+		for i in range(len(self.time_columns)):
+			self.cbs[2].setItemData(i, self.time_columns[i], Qt.ToolTipRole)
 
 		self.cbs[1].clear()
-		self.cbs[1].addItems(np.unique(self.cb_options[1]+class_columns))
+		self.cbs[1].addItems(self.class_truncated)
+		for i in range(len(self.class_columns)):
+			self.cbs[1].setItemData(i, self.class_columns[i], Qt.ToolTipRole)
 
 	def ask_for_feature(self):
 
@@ -273,7 +279,8 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		# read instructions from combobox options
 		self.load_available_tables()
-		class_col = self.cbs[1].currentText()	
+		class_col = self.class_columns[self.cbs[1].currentIndex()]
+		print(f"{class_col=}")	
 
 		if self.df is not None:
 
@@ -300,18 +307,10 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		"""
 
-		self.well_option = self.parent_window.parent_window.well_list.currentIndex()
-		if self.well_option==len(self.wells):
-			wo = '*'
-		else:
-			wo = self.well_option
-		self.position_option = self.parent_window.parent_window.position_list.currentIndex()
-		if self.position_option==0:
-			po = '*'
-		else:
-			po = self.position_option - 1
+		self.well_option = self.parent_window.parent_window.well_list.getSelectedIndices()		
+		self.position_option = self.parent_window.parent_window.position_list.getSelectedIndices()
 
-		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=wo, position_option=po, population=self.cbs[0].currentText(), return_pos_info=True)
+		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=self.well_option, position_option=self.position_option, population=self.cbs[0].currentText(), return_pos_info=True)
 
 		if self.df is None:
 			
@@ -337,8 +336,8 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		# Per position signal
 		max_time = int(self.df.FRAME.max()) + 1
-		class_col = self.cbs[1].currentText()
-		time_col = self.cbs[2].currentText()
+		class_col = self.class_columns[self.cbs[1].currentIndex()]
+		time_col = self.time_columns[self.cbs[2].currentIndex()]
 		if self.abs_time_checkbox.isChecked():
 			time_col = self.frame_slider.value()
 
@@ -375,6 +374,9 @@ class ConfigSignalPlot(QWidget, Styles):
 		if isinstance(cclass,int):
 			cclass = [cclass]
 
+		class_col = self.class_columns[self.cbs[1].currentIndex()]
+		time_col = self.time_columns[self.cbs[2].currentIndex()]
+
 		n_cells = len(well_group.groupby(['position','TRACK_ID']))
 		depth = int(2*max_time + 3)
 		matrix = np.zeros((n_cells, depth))
@@ -382,14 +384,14 @@ class ConfigSignalPlot(QWidget, Styles):
 		mapping = np.arange(-max_time-1, max_time+2)
 		cid=0
 		for block,movie_group in well_group.groupby('position'):
-			for tid,track_group in movie_group.loc[movie_group[self.cbs[1].currentText()].isin(cclass)].groupby('TRACK_ID'):
+			for tid,track_group in movie_group.loc[movie_group[class_col].isin(cclass)].groupby('TRACK_ID'):
 				try:
 					timeline = track_group['FRAME'].to_numpy().astype(int)
 					feature = track_group[feature_selected].to_numpy()
 					if self.checkBox_feature.isChecked():
 						second_feature=track_group[self.second_feature_selected].to_numpy()
 					if self.cbs[2].currentText().startswith('t') and not self.abs_time_checkbox.isChecked():
-						t0 = math.floor(track_group[self.cbs[2].currentText()].to_numpy()[0])
+						t0 = math.floor(track_group[time_col].to_numpy()[0])
 						timeline -= t0
 					elif self.cbs[2].currentText()=='first detection' and not self.abs_time_checkbox.isChecked():
 
@@ -401,7 +403,6 @@ class ConfigSignalPlot(QWidget, Styles):
 
 						first_detection = timeline[feat==feat][0]
 						timeline -= first_detection
-						print(first_detection, timeline)
 
 					elif self.abs_time_checkbox.isChecked():
 						timeline -= int(self.frame_slider.value())
@@ -410,7 +411,6 @@ class ConfigSignalPlot(QWidget, Styles):
 					matrix[cid,loc_t] = feature
 					if second_feature:
 						matrix[cid,loc_t+1]=second_feature
-					print(timeline, loc_t)
 
 					cid+=1
 				except:

celldetective/gui/process_block.py

@@ -186,11 +186,8 @@ class ProcessPanel(QFrame, Styles):
 		measure_layout = QHBoxLayout()
 
 		self.measure_action = QCheckBox("MEASURE")
-		self.measure_action.setStyleSheet("""
-			font-size: 10px;
-			padding-left: 10px;
-			padding-top: 5px;
-			""")
+		self.measure_action.setStyleSheet(self.menu_check_style)
+
 		self.measure_action.setIcon(icon(MDI6.eyedropper,color="black"))
 		self.measure_action.setIconSize(QSize(20, 20))
 		self.measure_action.setToolTip("Measure.")
@@ -229,11 +226,7 @@ class ProcessPanel(QFrame, Styles):
 		signal_layout = QVBoxLayout()
 		signal_hlayout = QHBoxLayout()
 		self.signal_analysis_action = QCheckBox("DETECT EVENTS")
-		self.signal_analysis_action.setStyleSheet("""
-			font-size: 10px;
-			padding-left: 10px;
-			padding-top: 5px;
-			""")
+		self.signal_analysis_action.setStyleSheet(self.menu_check_style)
 		self.signal_analysis_action.setIcon(icon(MDI6.chart_bell_curve_cumulative,color="black"))
 		self.signal_analysis_action.setIconSize(QSize(20, 20))
 		self.signal_analysis_action.setToolTip("Detect events in single-cell signals.")
@@ -295,14 +288,10 @@ class ProcessPanel(QFrame, Styles):
 		grid_track = QHBoxLayout()
 
 		self.track_action = QCheckBox("TRACK")
+		self.track_action.setStyleSheet(self.menu_check_style)
 		self.track_action.setIcon(icon(MDI6.chart_timeline_variant,color="black"))
 		self.track_action.setIconSize(QSize(20, 20))
 		self.track_action.setToolTip("Track the target cells using bTrack.")
-		self.track_action.setStyleSheet("""
-			font-size: 10px;
-			padding-left: 10px;
-			padding-top: 5px;
-			""")
 		grid_track.addWidget(self.track_action, 75)
 
 		self.delete_tracks_btn = QPushButton()
@@ -372,10 +361,7 @@ class ProcessPanel(QFrame, Styles):
 		grid_segment.setSpacing(0)
 
 		self.segment_action = QCheckBox("SEGMENT")
-		self.segment_action.setStyleSheet("""
-			font-size: 10px;
-			padding-left: 10px;
-			""")
+		self.segment_action.setStyleSheet(self.menu_check_style)
 		self.segment_action.setIcon(icon(MDI6.bacteria, color='black'))
 		self.segment_action.setToolTip(f"Segment the {self.mode} cells on the images.")
 		self.segment_action.toggled.connect(self.enable_segmentation_model_list)
@@ -698,11 +684,24 @@ class ProcessPanel(QFrame, Styles):
 
 	def process_population(self):
 
-		if self.parent_window.well_list.currentText()=="*":
-			self.well_index = np.linspace(0,len(self.wells)-1,len(self.wells),dtype=int)
-		else:
-			self.well_index = [self.parent_window.well_list.currentIndex()]
-			print(f"Processing well {self.parent_window.well_list.currentText()}...")
+		# if self.parent_window.well_list.currentText().startswith('Multiple'):
+		# 	self.well_index = np.linspace(0,len(self.wells)-1,len(self.wells),dtype=int)
+		# else:
+		
+		self.well_index = self.parent_window.well_list.getSelectedIndices()
+		if len(self.well_index)==0:
+			msgBox = QMessageBox()
+			msgBox.setIcon(QMessageBox.Warning)
+			msgBox.setText("Please select at least one well first...")
+			msgBox.setWindowTitle("Warning")
+			msgBox.setStandardButtons(QMessageBox.Ok)
+			returnValue = msgBox.exec()
+			if returnValue == QMessageBox.Ok:
+				return None
+			else:
+				return None
+
+		print(f"Processing {self.parent_window.well_list.currentText()}...")
 
 		# self.freeze()
 		# QApplication.setOverrideCursor(Qt.WaitCursor)
@@ -735,10 +734,10 @@ class ProcessPanel(QFrame, Styles):
 
 		loop_iter=0
 
-		if self.parent_window.position_list.currentText()=="*":
+		if self.parent_window.position_list.isMultipleSelection():
 			msgBox = QMessageBox()
 			msgBox.setIcon(QMessageBox.Question)
-			msgBox.setText("If you continue, all positions will be processed.\nDo you want to proceed?")
+			msgBox.setText("If you continue, several positions will be processed.\nDo you want to proceed?")
 			msgBox.setWindowTitle("Info")
 			msgBox.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 			returnValue = msgBox.exec()
@@ -767,12 +766,8 @@ class ProcessPanel(QFrame, Styles):
 		for w_idx in self.well_index:
 
 			pos = self.parent_window.positions[w_idx]
-			if self.parent_window.position_list.currentText()=="*":
-				pos_indices = np.linspace(0,len(pos)-1,len(pos),dtype=int)
-				print("Processing all positions...")
-			else:
-				pos_indices = natsorted([pos.index(self.parent_window.position_list.currentText())])
-				print(f"Processing position {self.parent_window.position_list.currentText()}...")
+			pos_indices = self.parent_window.position_list.getSelectedIndices()
+			#print(f"Processing position {self.parent_window.position_list.currentText()}...")
 
 			well = self.parent_window.wells[w_idx]
 
@@ -788,7 +783,7 @@ class ProcessPanel(QFrame, Styles):
 
 				if self.segment_action.isChecked():
 
-					if len(glob(os.sep.join([self.pos, f'labels_{self.mode}','*.tif'])))>0 and self.parent_window.position_list.currentText()!="*":
+					if len(glob(os.sep.join([self.pos, f'labels_{self.mode}','*.tif'])))>0 and not self.parent_window.position_list.isMultipleSelection():
 						msgBox = QMessageBox()
 						msgBox.setIcon(QMessageBox.Question)
 						msgBox.setText("Labels have already been produced for this position. Do you want to segment again?")
@@ -815,7 +810,7 @@ class ProcessPanel(QFrame, Styles):
 						segment_at_position(self.pos, self.mode, self.model_name, stack_prefix=self.parent_window.movie_prefix, use_gpu=self.parent_window.parent_window.use_gpu, threads=self.parent_window.parent_window.n_threads)
 
 				if self.track_action.isChecked():
-					if os.path.exists(os.sep.join([self.pos, 'output', 'tables', f'trajectories_{self.mode}.csv'])) and self.parent_window.position_list.currentText()!="*":
+					if os.path.exists(os.sep.join([self.pos, 'output', 'tables', f'trajectories_{self.mode}.csv'])) and not self.parent_window.position_list.isMultipleSelection():
 						msgBox = QMessageBox()
 						msgBox.setIcon(QMessageBox.Question)
 						msgBox.setText("A trajectory set already exists. Previously annotated data for\nthis position will be lost. Do you want to proceed?")
@@ -831,15 +826,12 @@ class ProcessPanel(QFrame, Styles):
 
 				table = os.sep.join([self.pos, 'output', 'tables', f'trajectories_{self.mode}.csv'])
 				if self.signal_analysis_action.isChecked() and os.path.exists(table):
-					print('table exists')
 					table = pd.read_csv(table)
 					cols = list(table.columns)
-					print(table, cols)
 					if 'class_color' in cols:
-						print(cols, 'class_color in cols')
 						colors = list(table['class_color'].to_numpy())
 						if 'tab:orange' in colors or 'tab:cyan' in colors:
-							if self.parent_window.position_list.currentText()!="*":
+							if not self.parent_window.position_list.isMultipleSelection():
 								msgBox = QMessageBox()
 								msgBox.setIcon(QMessageBox.Question)
 								msgBox.setText("The signals of the cells in the position appear to have been annotated... Do you want to proceed?")
@@ -871,7 +863,7 @@ class ProcessPanel(QFrame, Styles):
 			plot_mode = 'plot_track_signals'
 			if 'TRACK_ID' not in list(self.df.columns):
 				plot_mode = 'static'
-			self.tab_ui = TableUI(self.df, f"Well {self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}", population=self.mode, plot_mode=plot_mode, save_inplace_option=True)
+			self.tab_ui = TableUI(self.df, f"{self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}", population=self.mode, plot_mode=plot_mode, save_inplace_option=True)
 			self.tab_ui.show()
 		else:
 			print('Table could not be loaded...')
@@ -891,18 +883,10 @@ class ProcessPanel(QFrame, Styles):
 
 		"""
 
-		self.well_option = self.parent_window.well_list.currentIndex()
-		if self.well_option==len(self.wells):
-			wo = '*'
-		else:
-			wo = self.well_option
-		self.position_option = self.parent_window.position_list.currentIndex()
-		if self.position_option==0:
-			po = '*'
-		else:
-			po = self.position_option - 1
+		self.well_option = self.parent_window.well_list.getSelectedIndices()
+		self.position_option = self.parent_window.position_list.getSelectedIndices()
 
-		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=wo, position_option=po, population=self.mode, return_pos_info=True)
+		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=self.well_option, position_option=self.position_option, population=self.mode, return_pos_info=True)
 		if self.df is None:
 			print('No table could be found...')
 
@@ -1027,11 +1011,8 @@ class NeighPanel(QFrame, Styles):
 		# Button to compute the neighborhoods
 		neigh_option_hbox = QHBoxLayout()
 		self.neigh_action = QCheckBox('NEIGHBORHOODS')
-		self.neigh_action.setStyleSheet("""
-					font-size: 10px;
-					padding-left: 10px;
-					padding-top: 5px;
-					""")
+		self.neigh_action.setStyleSheet(self.menu_check_style)
+
 		#self.neigh_action.setIcon(icon(MDI6.eyedropper, color="black"))
 		#self.neigh_action.setIconSize(QSize(20, 20))
 		self.neigh_action.setToolTip(
@@ -1131,11 +1112,8 @@ class NeighPanel(QFrame, Styles):
 
 		rel_layout = QHBoxLayout()
 		self.measure_pairs_action = QCheckBox("MEASURE PAIRS")
-		self.measure_pairs_action.setStyleSheet("""
-					font-size: 10px;
-					padding-left: 10px;
-					padding-top: 5px;
-					""")
+		self.measure_pairs_action.setStyleSheet(self.menu_check_style)
+
 		self.measure_pairs_action.setIcon(icon(MDI6.eyedropper, color="black"))
 		self.measure_pairs_action.setIconSize(QSize(20, 20))
 		self.measure_pairs_action.setToolTip("Measure the relative quantities defined for the cell pairs, for all neighborhoods.")
@@ -1154,10 +1132,7 @@ class NeighPanel(QFrame, Styles):
 		signal_layout = QVBoxLayout()
 		signal_hlayout = QHBoxLayout()
 		self.signal_analysis_action = QCheckBox("DETECT PAIR EVENTS")
-		self.signal_analysis_action.setStyleSheet("""
-		font-size: 10px;
-		padding-left: 10px;
-		padding-top: 5px;""")
+		self.signal_analysis_action.setStyleSheet(self.menu_check_style)
 
 		self.signal_analysis_action.setIcon(icon(MDI6.chart_bell_curve_cumulative, color="black"))
 		self.signal_analysis_action.setIconSize(QSize(20, 20))
@@ -1282,18 +1257,10 @@ class NeighPanel(QFrame, Styles):
 
 		"""
 
-		self.well_option = self.parent_window.well_list.currentIndex()
-		if self.well_option==len(self.wells):
-			wo = '*'
-		else:
-			wo = self.well_option
-		self.position_option = self.parent_window.position_list.currentIndex()
-		if self.position_option==0:
-			po = '*'
-		else:
-			po = self.position_option - 1
+		self.well_option = self.parent_window.well_list.getSelectedIndices()
+		self.position_option = self.parent_window.position_list.getSelectedIndices()
 
-		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=wo, position_option=po, population="pairs", return_pos_info=True)
+		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=self.well_option, position_option=self.position_option, population="pairs", return_pos_info=True)
 		if self.df is None:
 			print('No table could be found...')
 
@@ -1305,7 +1272,7 @@ class NeighPanel(QFrame, Styles):
 
 		if self.df is not None:
 			plot_mode = 'static'
-			self.tab_ui = TableUI(self.df, f"Well {self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}", population='pairs', plot_mode=plot_mode, save_inplace_option=True)
+			self.tab_ui = TableUI(self.df, f"{self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}", population='pairs', plot_mode=plot_mode, save_inplace_option=True)
 			self.tab_ui.show()
 		else:
 			print('Table could not be loaded...')
@@ -1382,18 +1349,18 @@ class NeighPanel(QFrame, Styles):
 
 	def process_neighborhood(self):
 
-		if self.parent_window.well_list.currentText()=="*":
-			self.well_index = np.linspace(0,len(self.wells)-1,len(self.wells),dtype=int)
-		else:
-			self.well_index = [self.parent_window.well_list.currentIndex()]
-			print(f"Processing well {self.parent_window.well_list.currentText()}...")
+		# if self.parent_window.well_list.currentText().startswith('Multiple'):
+		# 	self.well_index = np.linspace(0,len(self.wells)-1,len(self.wells),dtype=int)
+		# else:
+		self.well_index = self.parent_window.well_list.getSelectedIndices()
+		print(f"Processing well {self.parent_window.well_list.currentText()}...")
 
 		# self.freeze()
 		# QApplication.setOverrideCursor(Qt.WaitCursor)
 
 		loop_iter=0
 
-		if self.parent_window.position_list.currentText()=="*":
+		if self.parent_window.position_list.isMultipleSelection():
 			msgBox = QMessageBox()
 			msgBox.setIcon(QMessageBox.Question)
 			msgBox.setText("If you continue, all positions will be processed.\nDo you want to proceed?")
@@ -1406,12 +1373,7 @@ class NeighPanel(QFrame, Styles):
 		for w_idx in self.well_index:
 
 			pos = self.parent_window.positions[w_idx]
-			if self.parent_window.position_list.currentText()=="*":
-				pos_indices = np.linspace(0,len(pos)-1,len(pos),dtype=int)
-				print("Processing all positions...")
-			else:
-				pos_indices = natsorted([pos.index(self.parent_window.position_list.currentText())])
-				print(f"Processing position {self.parent_window.position_list.currentText()}...")
+			pos_indices = self.parent_window.position_list.getSelectedIndices()
 
 			well = self.parent_window.wells[w_idx]
 
@@ -1618,8 +1580,8 @@ class PreprocessingPanel(QFrame, Styles):
 		if returnValue == QMessageBox.Cancel:
 			return None
 		elif returnValue == QMessageBox.Yes:
-			self.parent_window.well_list.setCurrentIndex(self.parent_window.well_list.count()-1)
-			self.parent_window.position_list.setCurrentIndex(0)
+			self.parent_window.well_list.selectAll()
+			self.parent_window.position_list.selectAll()
 		elif returnValue == QMessageBox.No:
 			msgBox2 = QMessageBox()
 			msgBox2.setIcon(QMessageBox.Question)
@@ -1634,16 +1596,11 @@ class PreprocessingPanel(QFrame, Styles):
 
 		print('Proceed with correction...')
 
-		if self.parent_window.well_list.currentText()=='*':
-			well_option = "*"
-		else:
-			well_option = self.parent_window.well_list.currentIndex()
-
-		if self.parent_window.position_list.currentText()=='*':
-			pos_option = "*"
-		else:
-			pos_option = self.parent_window.position_list.currentIndex()-1
-
+		# if self.parent_window.well_list.currentText()=='*':
+		# 	well_option = "*"
+		# else:
+		well_option = self.parent_window.well_list.getSelectedIndices()
+		position_option = self.parent_window.position_list.getSelectedIndices()
 
 		for k,correction_protocol in enumerate(self.protocol_layout.protocols):
 
@@ -1658,7 +1615,7 @@ class PreprocessingPanel(QFrame, Styles):
 				print(f'Model-free correction; {movie_prefix=} {export_prefix=}')
 				correct_background_model_free(self.exp_dir, 
 								   well_option=well_option,
-								   position_option=pos_option,
+								   position_option=position_option,
 								   export = True,
 								   return_stacks=False,
 								   show_progress_per_well = True,
@@ -1672,7 +1629,7 @@ class PreprocessingPanel(QFrame, Styles):
 				print(f'Fit correction; {movie_prefix=} {export_prefix=} {correction_protocol=}')
 				correct_background_model(self.exp_dir,
 								   well_option=well_option,
-								   position_option=pos_option,
+								   position_option=position_option,
 								   export= True,
 								   return_stacks=False,
 								   show_progress_per_well = True,
@@ -1685,7 +1642,7 @@ class PreprocessingPanel(QFrame, Styles):
 				print(f'Offset correction; {movie_prefix=} {export_prefix=} {correction_protocol=}')
 				correct_channel_offset(self.exp_dir,
 								   well_option=well_option,
-								   position_option=pos_option,
+								   position_option=position_option,
 								   export= True,
 								   return_stacks=False,
 								   show_progress_per_well = True,
@@ -1703,6 +1660,7 @@ class PreprocessingPanel(QFrame, Styles):
 		Load the first frame of the first movie found in the experiment folder as a sample.
 		"""
 
+		print(f"{self.parent_window.pos}")
 		movies = glob(self.parent_window.pos + os.sep.join(['movie', f"{self.parent_window.movie_prefix}*.tif"]))
 
 		if len(movies) == 0:

celldetective/gui/signal_annotator.py

@@ -50,6 +50,7 @@ class SignalAnnotator(QMainWindow, Styles):
 		self.soft_path = get_software_location()
 		self.recently_modified = False
 		self.selection = []
+
 		if self.mode == "targets":
 			self.instructions_path = self.exp_dir + os.sep.join(['configs', 'signal_annotator_config_targets.json'])
 			self.trajectories_path = self.pos + os.sep.join(['output','tables','trajectories_targets.csv'])
@@ -505,6 +506,11 @@ class SignalAnnotator(QMainWindow, Styles):
 		self.df_tracks['class_color'] = [color_from_class(i) for i in self.df_tracks[self.class_name].to_numpy()]
 
 		self.extract_scatter_from_trajectories()
+		if len(self.selection)>0:
+			self.select_single_cell(self.selection[0][0], self.selection[0][1])
+
+		self.fcanvas.canvas.draw()
+
 
 	def contrast_slider_action(self):
 
@@ -527,14 +533,14 @@ class SignalAnnotator(QMainWindow, Styles):
 		try:
 			self.selection.pop(0)
 		except Exception as e:
-			print(e)
+			print(f"L 536 {e=}")
 
 		try:
 			for k, (t, idx) in enumerate(zip(self.loc_t, self.loc_idx)):
 				self.colors[t][idx, 0] = self.previous_color[k][0]
 				self.colors[t][idx, 1] = self.previous_color[k][1]
 		except Exception as e:
-			print(f'{e=}')
+			print(f'L 543 {e=}')
 
 	def hide_annotation_buttons(self):
 
@@ -589,7 +595,7 @@ class SignalAnnotator(QMainWindow, Styles):
 				self.line_dt.set_xdata([t0, t0])
 				self.cell_fcanvas.canvas.draw_idle()
 			except Exception as e:
-				print(e)
+				print(f"L 598 {e=}")
 				t0 = -1
 				cclass = 2
 		elif self.no_event_btn.isChecked():
@@ -611,9 +617,14 @@ class SignalAnnotator(QMainWindow, Styles):
 			status[:] = 2
 		if cclass > 2:
 			status[:] = 42
+
 		status_color = [color_from_status(s, recently_modified=True) for s in status]
 		class_color = [color_from_class(cclass, recently_modified=True) for i in range(len(status))]
 
+
+		# self.df_tracks['status_color'] = [color_from_status(i) for i in self.df_tracks[self.status_name].to_numpy()]
+		# self.df_tracks['class_color'] = [color_from_class(i) for i in self.df_tracks[self.class_name].to_numpy()]
+
 		self.df_tracks.loc[indices, self.status_name] = status
 		self.df_tracks.loc[indices, 'status_color'] = status_color
 		self.df_tracks.loc[indices, 'class_color'] = class_color
@@ -984,13 +995,9 @@ class SignalAnnotator(QMainWindow, Styles):
 				self.stack[np.where(self.stack > 0.)] = np.log(self.stack[np.where(self.stack > 0.)])
 
 	def closeEvent(self, event):
+		
 		try:
 			self.stop()
-			# result = QMessageBox.question(self,
-			# 			  "Confirm Exit...",
-			# 			  "Are you sure you want to exit ?",
-			# 			  QMessageBox.Yes| QMessageBox.No,
-			# 			  )
 			del self.stack
 			gc.collect()
 		except:
@@ -1068,6 +1075,8 @@ class SignalAnnotator(QMainWindow, Styles):
 
 	def on_scatter_pick(self, event):
 
+		self.event = event
+
 		self.correct_btn.disconnect()
 		self.correct_btn.clicked.connect(self.show_annotation_buttons)
 
@@ -1082,36 +1091,41 @@ class SignalAnnotator(QMainWindow, Styles):
 			ind = [ind[np.argmin(dist)]]
 
 		if len(ind) > 0 and (len(self.selection) == 0):
-			ind = ind[0]
-			self.selection.append(ind)
-			self.correct_btn.setEnabled(True)
-			self.cancel_btn.setEnabled(True)
-			self.del_shortcut.setEnabled(True)
-			self.no_event_shortcut.setEnabled(True)
-
-			self.track_of_interest = self.tracks[self.framedata][ind]
-			print(f'You selected cell #{self.track_of_interest}...')
-			self.give_cell_information()
-			self.plot_signals()
-
-			self.loc_t = []
-			self.loc_idx = []
-			for t in range(len(self.tracks)):
-				indices = np.where(self.tracks[t] == self.track_of_interest)[0]
-				if len(indices) > 0:
-					self.loc_t.append(t)
-					self.loc_idx.append(indices[0])
-
-			self.previous_color = []
-			for t, idx in zip(self.loc_t, self.loc_idx):
-				self.previous_color.append(self.colors[t][idx].copy())
-				self.colors[t][idx] = 'lime'
+			
+			self.selection.append([ind[0],self.framedata])
+			self.select_single_cell(ind[0], self.framedata)
 
 		elif len(ind) > 0 and len(self.selection) == 1:
 			self.cancel_btn.click()
 		else:
 			pass
 
+	def select_single_cell(self, index, timepoint):
+
+		self.correct_btn.setEnabled(True)
+		self.cancel_btn.setEnabled(True)
+		self.del_shortcut.setEnabled(True)
+		self.no_event_shortcut.setEnabled(True)
+
+		self.track_of_interest = self.tracks[timepoint][index]
+		print(f'You selected cell #{self.track_of_interest}...')
+		self.give_cell_information()
+		self.plot_signals()
+
+		self.loc_t = []
+		self.loc_idx = []
+		for t in range(len(self.tracks)):
+			indices = np.where(self.tracks[t] == self.track_of_interest)[0]
+			if len(indices) > 0:
+				self.loc_t.append(t)
+				self.loc_idx.append(indices[0])
+
+		self.previous_color = []
+		for t, idx in zip(self.loc_t, self.loc_idx):
+			self.previous_color.append(self.colors[t][idx].copy())
+			self.colors[t][idx] = 'lime'
+
+
 	def shortcut_suppr(self):
 		self.correct_btn.click()
 		self.suppr_btn.click()
@@ -1158,6 +1172,7 @@ class SignalAnnotator(QMainWindow, Styles):
 			if len(min_values) > 0:
 				self.cell_ax.set_ylim(smallest_value - pad_small, largest_value + pad_large)
 		except Exception as e:
+			print(f"L1170 {e=}")
 			pass
 
 	def draw_frame(self, framedata):
@@ -1220,6 +1235,7 @@ class SignalAnnotator(QMainWindow, Styles):
 		self.df_tracks = self.df_tracks.drop(self.df_tracks[self.df_tracks[self.class_name] > 2].index)
 		self.df_tracks.to_csv(self.trajectories_path, index=False)
 		print('Table successfully exported...')
+		self.compute_status_and_colors(0)
 		self.extract_scatter_from_trajectories()
 
 	# self.give_cell_information()
@@ -2424,6 +2440,8 @@ class MeasureAnnotator(SignalAnnotator):
 		except Exception as e:
 			print("cancel_selection: ",f'{e=}')
 
+		self.event = None
+
 	def locate_stack(self):
 
 		"""

celldetective/gui/signal_annotator2.py

@@ -2213,10 +2213,13 @@ class SignalAnnotator2(QMainWindow,Styles):
 			self.index = ind[0]
 		elif len(ind)>1:
 			# More than one point in vicinity
-			datax,datay = [positions[self.framedata][i,0] for i in ind],[positions[self.framedata][i,1] for i in ind]
-			msx, msy = event.mouseevent.xdata, event.mouseevent.ydata
-			dist = np.sqrt((np.array(datax)-msx)**2+(np.array(datay)-msy)**2)
-			self.index = ind[np.argmin(dist)]
+			try:
+				datax,datay = [positions[self.framedata][i,0] for i in ind],[positions[self.framedata][i,1] for i in ind]
+				msx, msy = event.mouseevent.xdata, event.mouseevent.ydata
+				dist = np.sqrt((np.array(datax)-msx)**2+(np.array(datay)-msy)**2)
+				self.index = ind[np.argmin(dist)]
+			except Exception as e:
+				print(f"{e=}")
 		else:
 			self.index = None