celldetective 1.3.7.post1__py3-none-any.whl → 1.3.8__py3-none-any.whl

celldetective/gui/seg_model_loader.py

@@ -1,4 +1,4 @@
-from PyQt5.QtWidgets import QWidget, QGridLayout, QVBoxLayout, QLabel, QLineEdit, QHBoxLayout, QRadioButton, QFileDialog, QPushButton, QMessageBox
+from PyQt5.QtWidgets import QWidget, QGridLayout, QComboBox, QVBoxLayout, QLabel, QLineEdit, QHBoxLayout, QRadioButton, QFileDialog, QPushButton, QMessageBox
 from PyQt5.QtCore import Qt, QSize
 from celldetective.gui.gui_utils import center_window
 from celldetective.gui.layouts import ChannelNormGenerator
@@ -79,13 +79,24 @@ class SegmentationModelLoader(QWidget, Styles):
 		self.layout.addWidget(self.open_dialog_button, 9, 0, 1, 1)
 		self.layout.addWidget(self.file_label, 9, 1, 1, 1)
 
+
+		self.merge_lbl = QLabel('Merging option: ')
+		self.merge_cb = QComboBox()
+		self.merge_cb.addItems(['OR'])
+		merge_hbox = QHBoxLayout()
+		merge_hbox.addWidget(self.merge_lbl, 33)
+		merge_hbox.addWidget(self.merge_cb, 66)
+		self.layout.addLayout(merge_hbox, 10, 0, 1, 2)
+		self.merge_lbl.hide()
+		self.merge_cb.hide()
+
 		self.upload_button = QPushButton("Upload")
 		self.upload_button.clicked.connect(self.upload_model)
 		self.upload_button.setIcon(icon(MDI6.upload,color="white"))
 		self.upload_button.setIconSize(QSize(25, 25))
 		self.upload_button.setStyleSheet(self.button_style_sheet)
 		self.upload_button.setEnabled(False)
-		self.layout.addWidget(self.upload_button, 10, 0, 1, 1)
+		self.layout.addWidget(self.upload_button, 11, 0, 1, 1)
 		
 		self.base_block_options = [self.calibration_label, self.spatial_calib_le,*self.channel_layout.channel_cbs,*self.channel_layout.channel_labels,*self.channel_layout.normalization_mode_btns, *self.channel_layout.normalization_clip_btns, *self.channel_layout.normalization_min_value_lbl,
 								   *self.channel_layout.normalization_min_value_le, *self.channel_layout.normalization_max_value_lbl,*self.channel_layout.normalization_max_value_le,
@@ -207,41 +218,73 @@ class SegmentationModelLoader(QWidget, Styles):
 			self.file_dialog.setFileMode(QFileDialog.ExistingFile)
 
 		# If accepted check validity of data
-		if self.file_dialog.exec_() == QFileDialog.Accepted:
-			self.filename = self.file_dialog.selectedFiles()[0]
-			if self.seg_mode=="stardist":
-				subfiles = glob(self.filename+"/*")
-				subfiles = [s.replace('\\','/') for s in subfiles]
-				if self.filename+"/thresholds.json" in subfiles:
+		if self.seg_mode!='threshold':
+			if self.file_dialog.exec_() == QFileDialog.Accepted:
+				self.filename = self.file_dialog.selectedFiles()[0]
+				if self.seg_mode=="stardist":
+					subfiles = glob(self.filename+"/*")
+					subfiles = [s.replace('\\','/') for s in subfiles]
+					if self.filename+"/thresholds.json" in subfiles:
+						self.file_label.setText(self.filename.split("/")[-1])
+						self.modelname = self.filename.split("/")[-1]
+						self.destination = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]+f"/models/{self.target_folder}/"+self.modelname
+						self.folder_dest = self.destination
+					else:
+						msgBox = QMessageBox()
+						msgBox.setIcon(QMessageBox.Warning)
+						msgBox.setText("StarDist model not recognized... Please ensure that it contains a thresholds.json file or that it is a valid StarDist model...")
+						msgBox.setWindowTitle("Warning")
+						msgBox.setStandardButtons(QMessageBox.Ok)
+						returnValue = msgBox.exec()
+						if returnValue == QMessageBox.Ok:
+							return None					
+				
+				if self.seg_mode=="cellpose":
 					self.file_label.setText(self.filename.split("/")[-1])
 					self.modelname = self.filename.split("/")[-1]
-					self.destination = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]+f"/models/{self.target_folder}/"+self.modelname
-					self.folder_dest = self.destination
+					print(f"Transferring Cellpose model {self.filename}...")
+					self.folder_dest = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]+f"/models/{self.target_folder}/"+self.modelname
+					self.destination = self.folder_dest+f"/{self.modelname}"
+
+		else:
+			self.filename, _ = QFileDialog.getOpenFileNames(
+														None,
+														"Load threshold configuration(s)...",
+														"",
+														"Json Configs (*.json)",
+														)
+			if self.filename:
+				n_files = len(self.filename)
+				print(f'You loaded {n_files} threshold configuration files...')
+				for i,filename in enumerate(self.filename):
+					print(f"Config {i}: ",filename,"...")
+
+				if n_files==1:
+					self.merge_cb.hide()
+					self.merge_lbl.hide()
+					self.file_label.setText(self.filename[0].split("/")[-1])
 				else:
 					msgBox = QMessageBox()
 					msgBox.setIcon(QMessageBox.Warning)
-					msgBox.setText("StarDist model not recognized... Please ensure that it contains a thresholds.json file or that it is a valid StarDist model...")
+					msgBox.setText("You selected more than one pipeline. Please set a merging procedure for the resulting masks...")
 					msgBox.setWindowTitle("Warning")
 					msgBox.setStandardButtons(QMessageBox.Ok)
 					returnValue = msgBox.exec()
 					if returnValue == QMessageBox.Ok:
-						return None					
-			
-			if self.seg_mode=="cellpose":
-				self.file_label.setText(self.filename.split("/")[-1])
-				self.modelname = self.filename.split("/")[-1]
-				print(f"Transferring Cellpose model {self.filename}...")
-				self.folder_dest = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]+f"/models/{self.target_folder}/"+self.modelname
-				self.destination = self.folder_dest+f"/{self.modelname}"
+						pass
 
-			if self.seg_mode=="threshold":
-				self.file_label.setText(self.filename.split("/")[-1])
+					self.merge_cb.show()
+					self.merge_lbl.show()
+					self.file_label.setText(f"{n_files} configs loaded...")
 
 	def show_seg_options(self):
 
 		"""
 		Show the relevant widgets, mask the others.
 		"""
+
+		self.filename = None
+		self.file_label.setText('No file chosen')
 		self.base_block_options = [self.calibration_label, self.spatial_calib_le,*self.channel_layout.channel_cbs,*self.channel_layout.channel_labels,*self.channel_layout.normalization_mode_btns, *self.channel_layout.normalization_clip_btns, *self.channel_layout.normalization_min_value_lbl,
 								   *self.channel_layout.normalization_min_value_le, *self.channel_layout.normalization_max_value_lbl,*self.channel_layout.normalization_max_value_le,
 								   self.channel_layout.add_col_btn]
@@ -250,7 +293,7 @@ class SegmentationModelLoader(QWidget, Styles):
 			self.spatial_calib_le.setToolTip('Cellpose rescales the images such that the cells are 30.0 pixels. You can compute the scale from the training data as\n(pixel calibration [µm] in training images)*(cell diameter [px] in training images)/(30 [px]).\nIf you pass images with a different calibration to the model, they will be rescaled automatically.\nThe rescaling is ignored if you pass a diameter different from 30 px below.')
 			self.channel_layout.channel_labels[0].setText('cyto: ')
 			self.channel_layout.channel_labels[1].setText('nuclei: ')
-			for c in [self.threshold_config_button]:
+			for c in [self.threshold_config_button, self.merge_lbl, self.merge_cb]:
 				c.hide()
 			for c in self.cellpose_options+self.base_block_options:
 				c.show()
@@ -261,7 +304,7 @@ class SegmentationModelLoader(QWidget, Styles):
 			self.channel_layout.channel_labels[1].setText('channel 2: ')
 			for c in self.base_block_options:
 				c.show()
-			for c in self.cellpose_options+[self.threshold_config_button]:
+			for c in self.cellpose_options+[self.threshold_config_button, self.merge_lbl, self.merge_cb]:
 				c.hide()
 			self.unlock_upload()
 		else:
@@ -346,7 +389,10 @@ class SegmentationModelLoader(QWidget, Styles):
 			self.parent_window.init_seg_model_list()
 			self.close()
 		else:
-			if self.mode=="targets":	
+			if not isinstance(self.filename, list):
+				if not self.filename is None:
+					self.filename = [self.filename]
+			if self.mode=="targets":
 				self.parent_window.threshold_config_targets = self.filename
 				self.parent_window.seg_model_list.setCurrentText('Threshold')
 				print('Path to the traditional segmentation pipeline successfully set in celldetective...')
@@ -355,7 +401,7 @@ class SegmentationModelLoader(QWidget, Styles):
 				self.parent_window.threshold_config_effectors = self.filename
 				self.parent_window.seg_model_list.setCurrentText('Threshold')
 				print('Path to the traditional segmentation pipeline successfully set in celldetective...')
-				self.close()	
+				self.close()
 
 	def generate_input_config(self):
 

celldetective/gui/signal_annotator2.py

@@ -1577,13 +1577,16 @@ class SignalAnnotator2(QMainWindow,Styles):
 					self.cell_ax.set_ylim(self.value_magnitude, self.non_log_ymax)					
 
 		if self.reference_track_of_interest is not None and self.neighbor_track_of_interest is not None:
-			t0 = self.df_relative.loc[(self.df_relative['REFERENCE_ID'] == self.reference_track_of_interest)&(self.df_relative['NEIGHBOR_ID'] == self.neighbor_track_of_interest)&(self.df_relative['reference_population'] == self.reference_population)&(self.df_relative['neighbor_population'] == self.neighbor_population), self.pair_time_name].dropna().to_numpy()
-			if t0!=[]:
-				t0=t0[0]
-				ymin,ymax = self.cell_ax.get_ylim()
-				self.line_dt.set_xdata([t0, t0])
-				self.line_dt.set_ydata([ymin,ymax])
-
+			t0 = self.df_relative.loc[(self.df_relative['REFERENCE_ID'] == self.reference_track_of_interest)&(self.df_relative['NEIGHBOR_ID'] == self.neighbor_track_of_interest)&(self.df_relative['reference_population'] == self.reference_population)&(self.df_relative['neighbor_population'] == self.neighbor_population), self.pair_time_name].dropna().values
+			try:
+				if t0!=[]:
+					t0=t0[0]
+					ymin,ymax = self.cell_ax.get_ylim()
+					self.line_dt.set_xdata([t0, t0])
+					self.line_dt.set_ydata([ymin,ymax])
+			except Exception as e:
+				print(e)
+			
 		self.cell_ax.legend()
 		self.cell_fcanvas.canvas.draw()
 

celldetective/gui/signal_annotator_options.py

@@ -34,7 +34,7 @@ class ConfigSignalAnnotator(QMainWindow, Styles):
 			self.instructions_path = self.parent_window.exp_dir + "configs/signal_annotator_config_targets.json"
 		elif self.mode=="effectors":
 			self.instructions_path = self.parent_window.exp_dir + "configs/signal_annotator_config_effectors.json"
-		elif self.mode == "neighborhood":
+		elif self.mode == "pairs":
 			self.instructions_path = self.parent_window.exp_dir + "configs/signal_annotator_config_neighborhood.json"
 
 		exp_config = self.exp_dir +"config.ini"

celldetective/gui/tableUI.py

@@ -166,7 +166,7 @@ class DifferentiateColWidget(QWidget, Styles):
 		layout.addLayout(measurement_layout)
 
 		self.window_size_slider = QLabeledSlider()
-		self.window_size_slider.setRange(1,np.nanmax(self.parent_window.data.FRAME.to_numpy()))
+		self.window_size_slider.setRange(1,int(np.nanmax(self.parent_window.data.FRAME.to_numpy())))
 		self.window_size_slider.setValue(3)
 		window_layout = QHBoxLayout()
 		window_layout.addWidget(QLabel('window size: '), 25)
@@ -215,6 +215,108 @@ class DifferentiateColWidget(QWidget, Styles):
 		self.parent_window.table_view.setModel(self.parent_window.model)
 		self.close()
 
+
+
+class OperationOnColsWidget(QWidget, Styles):
+
+	def __init__(self, parent_window, column1=None, column2=None, operation='divide'):
+
+		super().__init__()
+		self.parent_window = parent_window
+		self.column1 = column1
+		self.column2 = column2
+		self.operation = operation
+
+		self.setWindowTitle(self.operation)
+		# Create the QComboBox and add some items
+		center_window(self)
+		
+		layout = QVBoxLayout(self)
+		layout.setContentsMargins(30,30,30,30)
+
+		self.col1_cb = QComboBox()
+		self.col1_cb.addItems(list(self.parent_window.data.columns))
+		if self.column1 is not None:
+			idx = self.col1_cb.findText(self.column1)
+			self.col1_cb.setCurrentIndex(idx)
+
+		numerator_layout = QHBoxLayout()
+		numerator_layout.addWidget(QLabel('column 1: '), 25)
+		numerator_layout.addWidget(self.col1_cb, 75)
+		layout.addLayout(numerator_layout)
+
+		self.col2_cb = QComboBox()
+		self.col2_cb.addItems(list(self.parent_window.data.columns))
+		if self.column2 is not None:
+			idx = self.col2_cb.findText(self.column2)
+			self.col2_cb.setCurrentIndex(idx)
+
+		denominator_layout = QHBoxLayout()
+		denominator_layout.addWidget(QLabel('column 2: '), 25)
+		denominator_layout.addWidget(self.col2_cb, 75)
+		layout.addLayout(denominator_layout)
+
+		self.submit_btn = QPushButton('Compute')
+		self.submit_btn.setStyleSheet(self.button_style_sheet)
+		self.submit_btn.clicked.connect(self.compute)
+		layout.addWidget(self.submit_btn, 30)
+
+		self.setAttribute(Qt.WA_DeleteOnClose)
+
+	def compute(self):
+
+		test = self._check_cols_before_operation()
+		if not test:
+			msgBox = QMessageBox()
+			msgBox.setIcon(QMessageBox.Warning)
+			msgBox.setText(f"Operation could not be performed, one of the column types is object...")
+			msgBox.setWindowTitle("Warning")
+			msgBox.setStandardButtons(QMessageBox.Ok)
+			returnValue = msgBox.exec()
+			if returnValue == QMessageBox.Ok:
+				return None
+			else:
+				return None
+		else:
+			if self.operation=='divide':
+				name = f"{self.col1_txt}/{self.col2_txt}"
+				with np.errstate(divide='ignore', invalid='ignore'):
+					res = np.true_divide(self.col1, self.col2)
+					res[res == np.inf] = np.nan
+					res[self.col1!=self.col1] = np.nan
+					res[self.col2!=self.col2] = np.nan
+					self.parent_window.data[name] = res
+
+			elif self.operation=='multiply':
+				name = f"{self.col1_txt}*{self.col2_txt}"
+				res = np.multiply(self.col1, self.col2)
+
+			elif self.operation=='add':
+				name = f"{self.col1_txt}+{self.col2_txt}"
+				res = np.add(self.col1, self.col2)
+
+			elif self.operation=='subtract':
+				name = f"{self.col1_txt}-{self.col2_txt}"
+				res = np.subtract(self.col1, self.col2)				
+			
+			self.parent_window.data[name] = res
+			self.parent_window.model = PandasModel(self.parent_window.data)
+			self.parent_window.table_view.setModel(self.parent_window.model)
+			self.close()
+
+	def _check_cols_before_operation(self):
+
+		self.col1_txt = self.col1_cb.currentText()
+		self.col2_txt = self.col2_cb.currentText()
+		
+		self.col1 = self.parent_window.data[self.col1_txt].to_numpy()
+		self.col2 = self.parent_window.data[self.col2_txt].to_numpy()
+
+		test = np.all([self.col1.dtype!='O', self.col2.dtype!='O'])
+
+		return test
+
+
 class CalibrateColWidget(GenericOpColWidget):
 	
 	def __init__(self, *args, **kwargs):
@@ -563,12 +665,34 @@ class TableUI(QMainWindow, Styles):
 		self.log_action = QAction('&Log (decimal)...', self)
 		self.log_action.triggered.connect(self.take_log_of_selected_feature)
 		#self.derivative_action.setShortcut("Ctrl+D")
-		self.mathMenu.addAction(self.log_action)						
+		self.mathMenu.addAction(self.log_action)
+
+
+		self.divide_action = QAction('&Divide...', self)
+		self.divide_action.triggered.connect(self.divide_signals)
+		#self.derivative_action.setShortcut("Ctrl+D")
+		self.mathMenu.addAction(self.divide_action)
+
+		self.multiply_action = QAction('&Multiply...', self)
+		self.multiply_action.triggered.connect(self.multiply_signals)
+		#self.derivative_action.setShortcut("Ctrl+D")
+		self.mathMenu.addAction(self.multiply_action)	
+
+		self.add_action = QAction('&Add...', self)
+		self.add_action.triggered.connect(self.add_signals)
+		#self.derivative_action.setShortcut("Ctrl+D")
+		self.mathMenu.addAction(self.add_action)	
+
+		self.subtract_action = QAction('&Subtract...', self)
+		self.subtract_action.triggered.connect(self.subtract_signals)
+		#self.derivative_action.setShortcut("Ctrl+D")
+		self.mathMenu.addAction(self.subtract_action)	
 
-		self.onehot_action = QAction('&One hot to categorical...', self)
-		self.onehot_action.triggered.connect(self.transform_one_hot_cols_to_categorical)
-		#self.onehot_action.setShortcut("Ctrl+D")
-		self.mathMenu.addAction(self.onehot_action)		
+
+		# self.onehot_action = QAction('&One hot to categorical...', self)
+		# self.onehot_action.triggered.connect(self.transform_one_hot_cols_to_categorical)
+		# #self.onehot_action.setShortcut("Ctrl+D")
+		# self.mathMenu.addAction(self.onehot_action)		
 
 	def collapse_pairs_in_neigh(self):
 
@@ -734,6 +858,96 @@ class TableUI(QMainWindow, Styles):
 			pos_group.to_csv(pos[0]+os.sep.join(['output', 'tables', f'trajectories_{self.population}.csv']), index=False)
 		print("Done...")
 
+	def divide_signals(self):
+
+		x = self.table_view.selectedIndexes()
+		col_idx = np.unique(np.array([l.column() for l in x]))
+		if isinstance(col_idx, (list, np.ndarray)):
+			cols = np.array(list(self.data.columns))
+			if len(col_idx)>0:
+				selected_col1 = str(cols[col_idx[0]])
+				if len(col_idx)>1:
+					selected_col2 = str(cols[col_idx[1]])
+				else:
+					selected_col2 = None
+			else:
+				selected_col1 = None
+				selected_col2 = None
+		else:
+			selected_col1 = None
+			selected_col2 = None
+
+		self.divWidget = OperationOnColsWidget(self, column1=selected_col1, column2=selected_col2, operation='divide')
+		self.divWidget.show()
+
+
+	def multiply_signals(self):
+
+		x = self.table_view.selectedIndexes()
+		col_idx = np.unique(np.array([l.column() for l in x]))
+		if isinstance(col_idx, (list, np.ndarray)):
+			cols = np.array(list(self.data.columns))
+			if len(col_idx)>0:
+				selected_col1 = str(cols[col_idx[0]])
+				if len(col_idx)>1:
+					selected_col2 = str(cols[col_idx[1]])
+				else:
+					selected_col2 = None
+			else:
+				selected_col1 = None
+				selected_col2 = None
+		else:
+			selected_col1 = None
+			selected_col2 = None
+
+		self.mulWidget = OperationOnColsWidget(self, column1=selected_col1, column2=selected_col2, operation='multiply')
+		self.mulWidget.show()
+
+	def add_signals(self):
+
+		x = self.table_view.selectedIndexes()
+		col_idx = np.unique(np.array([l.column() for l in x]))
+		if isinstance(col_idx, (list, np.ndarray)):
+			cols = np.array(list(self.data.columns))
+			if len(col_idx)>0:
+				selected_col1 = str(cols[col_idx[0]])
+				if len(col_idx)>1:
+					selected_col2 = str(cols[col_idx[1]])
+				else:
+					selected_col2 = None
+			else:
+				selected_col1 = None
+				selected_col2 = None
+		else:
+			selected_col1 = None
+			selected_col2 = None
+
+		self.addiWidget = OperationOnColsWidget(self, column1=selected_col1, column2=selected_col2, operation='add')
+		self.addiWidget.show()
+
+	def subtract_signals(self):
+
+		x = self.table_view.selectedIndexes()
+		col_idx = np.unique(np.array([l.column() for l in x]))
+		if isinstance(col_idx, (list, np.ndarray)):
+			cols = np.array(list(self.data.columns))
+			if len(col_idx)>0:
+				selected_col1 = str(cols[col_idx[0]])
+				if len(col_idx)>1:
+					selected_col2 = str(cols[col_idx[1]])
+				else:
+					selected_col2 = None
+			else:
+				selected_col1 = None
+				selected_col2 = None
+		else:
+			selected_col1 = None
+			selected_col2 = None
+
+		self.subWidget = OperationOnColsWidget(self, column1=selected_col1, column2=selected_col2, operation='subtract')
+		self.subWidget.show()
+
+
 	def differenciate_selected_feature(self):
 		
 		# check only one col selected and assert is numerical
@@ -742,9 +956,12 @@ class TableUI(QMainWindow, Styles):
 		
 		x = self.table_view.selectedIndexes()
 		col_idx = np.unique(np.array([l.column() for l in x]))
-		if col_idx!=0:
+		if isinstance(col_idx, (list, np.ndarray)):
 			cols = np.array(list(self.data.columns))
-			selected_col = str(cols[col_idx][0])
+			if len(col_idx)>0:
+				selected_col = str(cols[col_idx[0]])
+			else:
+				selected_col = None
 		else:
 			selected_col = None
 
@@ -759,9 +976,12 @@ class TableUI(QMainWindow, Styles):
 		
 		x = self.table_view.selectedIndexes()
 		col_idx = np.unique(np.array([l.column() for l in x]))
-		if col_idx!=0:
+		if isinstance(col_idx, (list, np.ndarray)):
 			cols = np.array(list(self.data.columns))
-			selected_col = str(cols[col_idx][0])
+			if len(col_idx)>0:
+				selected_col = str(cols[col_idx[0]])
+			else:
+				selected_col = None
 		else:
 			selected_col = None
 
@@ -772,9 +992,12 @@ class TableUI(QMainWindow, Styles):
 		
 		x = self.table_view.selectedIndexes()
 		col_idx = np.unique(np.array([l.column() for l in x]))
-		if col_idx!=0:
+		if isinstance(col_idx, (list, np.ndarray)):
 			cols = np.array(list(self.data.columns))
-			selected_col = str(cols[col_idx][0])
+			if len(col_idx)>0:
+				selected_col = str(cols[col_idx[0]])
+			else:
+				selected_col = None
 		else:
 			selected_col = None
 
@@ -790,9 +1013,12 @@ class TableUI(QMainWindow, Styles):
 		
 		x = self.table_view.selectedIndexes()
 		col_idx = np.unique(np.array([l.column() for l in x]))
-		if col_idx!=0:
+		if isinstance(col_idx, (list, np.ndarray)):
 			cols = np.array(list(self.data.columns))
-			selected_col = str(cols[col_idx][0])
+			if len(col_idx)>0:
+				selected_col = str(cols[col_idx[0]])
+			else:
+				selected_col = None
 		else:
 			selected_col = None
 
@@ -804,11 +1030,14 @@ class TableUI(QMainWindow, Styles):
 
 		x = self.table_view.selectedIndexes()
 		col_idx = np.unique(np.array([l.column() for l in x]))
-		if list(col_idx):
+		if isinstance(col_idx, (list, np.ndarray)):
 			cols = np.array(list(self.data.columns))
-			selected_cols = cols[col_idx]
+			if len(col_idx)>0:
+				selected_col = str(cols[col_idx[0]])
+			else:
+				selected_col = None
 		else:
-			selected_cols = None
+			selected_col = None
 
 		self.mergewidget = MergeOneHotWidget(self, selected_columns=selected_cols)
 		self.mergewidget.show()
@@ -874,7 +1103,7 @@ class TableUI(QMainWindow, Styles):
 		self.projection_option.setChecked(True)
 		self.projection_option.toggled.connect(self.enable_projection_options)
 		self.projection_op_cb = QComboBox()
-		self.projection_op_cb.addItems(['mean','median','min','max', 'prod', 'sum'])
+		self.projection_op_cb.addItems(['mean','median','min','max','first','last','prod','sum'])
 
 		projection_layout = QHBoxLayout()
 		projection_layout.addWidget(self.projection_option, 33)
@@ -1044,8 +1273,11 @@ class TableUI(QMainWindow, Styles):
 		all_cms = list(colormaps)
 		for cm in all_cms:
 			if hasattr(matplotlib.cm, str(cm).lower()):
-				self.cmap_cb.addColormap(cm.lower())
-		
+				try:
+					self.cmap_cb.addColormap(cm.lower())
+				except:
+					pass
+					
 		hbox = QHBoxLayout()
 		hbox.addWidget(QLabel('colormap: '), 33)
 		hbox.addWidget(self.cmap_cb, 66)

celldetective/gui/viewers.py

@@ -932,7 +932,7 @@ class CellSizeViewer(StackVisualizer):
 	  with interactive sliders for diameter adjustment and circle display.
 	"""
 
-	def __init__(self, initial_diameter=40, set_radius_in_list=False, diameter_slider_range=(0,200), parent_le=None, parent_list_widget=None, *args, **kwargs):
+	def __init__(self, initial_diameter=40, set_radius_in_list=False, diameter_slider_range=(0,500), parent_le=None, parent_list_widget=None, *args, **kwargs):
 		# Initialize the widget and its attributes
 		
 		super().__init__(*args, **kwargs)