celldetective 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

celldetective/gui/{signal_annotator_options.py → settings/_settings_signal_annotator.py}

@@ -1,5 +1,5 @@
 """
-Copright © 2023 Laboratoire Adhesion et Inflammation, Authored by Remy Torro.
+Copyright © 2023 Laboratoire Adhesion et Inflammation, Authored by Remy Torro.
 """
 
 from PyQt5.QtWidgets import QComboBox, QLabel, QRadioButton, QLineEdit, QApplication, QPushButton, QScrollArea, QVBoxLayout, QHBoxLayout
@@ -12,9 +12,9 @@ import numpy as np
 from superqt.fonticon import icon
 from fonticon_mdi6 import MDI6
 import os
-from celldetective.gui import CelldetectiveWidget, CelldetectiveMainWindow
+from celldetective.gui.settings._settings_base import CelldetectiveSettingsPanel
 
-class ConfigSignalAnnotator(CelldetectiveMainWindow):
+class SettingsSignalAnnotator(CelldetectiveSettingsPanel):
 	
 	"""
 	UI to set normalization and animation parameters for the annotator tool. 
@@ -23,65 +23,94 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 
 	def __init__(self, parent_window=None):
 		
-		super().__init__()
 		self.parent_window = parent_window
-		self.setWindowTitle("Configure signal annotator")
 		self.mode = self.parent_window.mode
 		self.exp_dir = self.parent_window.exp_dir
-		self.soft_path = get_software_location()
 		
 		self.instructions_path = self.parent_window.exp_dir + f"configs/signal_annotator_config_{self.mode}.json"
 		if self.mode == "pairs":
 			self.instructions_path = self.parent_window.exp_dir + "configs/signal_annotator_config_neighborhood.json"
 
-		exp_config = self.exp_dir +"config.ini"
-		#self.config_path = self.exp_dir + self.config_name
 		self.channel_names, self.channels = extract_experiment_channels(self.exp_dir)
 		self.channel_names = np.array(self.channel_names)
 		self.channels = np.array(self.channels)
 		self.log_option = False
+		
+		super().__init__(title="Configure signal annotator")
 
-		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
-		center_window(self)
+		self._add_to_layout()
+		self._load_previous_instructions()
+		
+		self._adjustSize()
+		self.resize(int(self.width()), int(self._screen_height * 0.55))
+	
+	def _add_to_layout(self):
+		
+		sub_layout = QVBoxLayout()
+		sub_layout.setContentsMargins(10,10,10,20)
+		sub_layout.setContentsMargins(30,30,30,30)
+		sub_layout.addWidget(self._modality_lbl)
+		
+		# Create radio buttons
+		option_layout = QHBoxLayout()
+		option_layout.addWidget(self.gs_btn, alignment=Qt.AlignCenter)
+		option_layout.addWidget(self.rgb_btn, alignment=Qt.AlignCenter)
+		sub_layout.addLayout(option_layout)
+		
+		btn_hbox = QHBoxLayout()
+		btn_hbox.addWidget(QLabel(''), 90)
+		btn_hbox.addWidget(self.log_btn, 5,alignment=Qt.AlignRight)
+		btn_hbox.addWidget(self.percentile_btn, 5,alignment=Qt.AlignRight)
+		sub_layout.addLayout(btn_hbox)
 
-		self.setMinimumHeight(int(0.4*self.screen_height))
-		self.setMaximumHeight(int(0.8*self.screen_height))
-		self.populate_widget()
-		#self.load_previous_measurement_instructions()
+		for i in range(3):
+			hlayout = QHBoxLayout()
+			hlayout.addWidget(self.channel_cbs_lbls[i], 20)
+			hlayout.addWidget(self.channel_cbs[i], 80)
+			sub_layout.addLayout(hlayout)
 
+			hlayout2 = QHBoxLayout()
+			hlayout2.addWidget(self.min_val_lbls[i], 20)
+			hlayout2.addWidget(self.min_val_les[i], 80)
+			sub_layout.addLayout(hlayout2)
+
+			hlayout3 = QHBoxLayout()
+			hlayout3.addWidget(self.max_val_lbls[i], 20)
+			hlayout3.addWidget(self.max_val_les[i], 80)
+			sub_layout.addLayout(hlayout3)
 
-	def populate_widget(self):
+		sub_layout.addWidget(self.hsep)
+		hbox_frac = QHBoxLayout()
+		hbox_frac.addWidget(self._fraction_lbl, 20)
+		hbox_frac.addWidget(self.fraction_slider, 80)
+		sub_layout.addLayout(hbox_frac)
+		
+		hbox_interval = QHBoxLayout()
+		hbox_interval.addWidget(self._interval_lbl, 20)
+		hbox_interval.addWidget(self.interval_slider, 80)
+		sub_layout.addLayout(hbox_interval)
+		
+		self._layout.addLayout(sub_layout)
+
+		self._layout.addWidget(self.submit_btn)
+
+	def _create_widgets(self):
 		
 		"""
 		Create the widgets.
 		
 		"""
-
-		self.scroll_area = QScrollArea(self)
-		self.button_widget = CelldetectiveWidget()
-
-		self.main_layout = QVBoxLayout()
-		self.main_layout.setContentsMargins(30,30,30,30)
-
-		sub_layout = QVBoxLayout()
-		sub_layout.setContentsMargins(10,10,10,20)
-
-		self.button_widget.setLayout(self.main_layout)
-		sub_layout.setContentsMargins(30,30,30,30)
-
-		sub_layout.addWidget(QLabel('Modality: '))
+		super()._create_widgets()
+		
+		self._modality_lbl = QLabel("Modality: ")
+		self._fraction_lbl = QLabel("fraction: ")
+		self._interval_lbl = QLabel('interval [ms]: ')
 		
-		# Create radio buttons
-		option_layout = QHBoxLayout()
 		self.gs_btn = QRadioButton('grayscale')
 		self.gs_btn.setChecked(True)
-		option_layout.addWidget(self.gs_btn, alignment=Qt.AlignCenter)
-
+		
 		self.rgb_btn = QRadioButton('RGB')
-		option_layout.addWidget(self.rgb_btn, alignment=Qt.AlignCenter)
-		sub_layout.addLayout(option_layout)
 
-		btn_hbox = QHBoxLayout()
 
 		self.percentile_btn = QPushButton()
 		self.percentile_btn.setIcon(icon(MDI6.percent_circle_outline,color="black"))
@@ -97,11 +126,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		self.log_btn.setToolTip("Log-transform the intensities.")
 		self.log_btn.setIconSize(QSize(20, 20))	
 
-		btn_hbox.addWidget(QLabel(''), 90)
-		btn_hbox.addWidget(self.log_btn, 5,alignment=Qt.AlignRight)
-		btn_hbox.addWidget(self.percentile_btn, 5,alignment=Qt.AlignRight)
-		sub_layout.addLayout(btn_hbox)
-
 		self.channel_cbs = [QComboBox() for i in range(3)]
 		self.channel_cbs_lbls = [QLabel() for i in range(3)]
 
@@ -115,23 +139,13 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 
 		for i in range(3):
 
-			hlayout = QHBoxLayout()
 			self.channel_cbs[i].addItems(self.channel_names)
 			self.channel_cbs[i].setCurrentIndex(i)
 			self.channel_cbs_lbls[i].setText(self.rgb_text[i])
-			hlayout.addWidget(self.channel_cbs_lbls[i], 20)
-			hlayout.addWidget(self.channel_cbs[i], 80)
-			sub_layout.addLayout(hlayout)
+			
+			self.min_val_les[i].setValidator(self._floatValidator)
+			self.max_val_les[i].setValidator(self._floatValidator)
 
-			hlayout2 = QHBoxLayout()
-			hlayout2.addWidget(self.min_val_lbls[i], 20)
-			hlayout2.addWidget(self.min_val_les[i], 80)			
-			sub_layout.addLayout(hlayout2)
-
-			hlayout3 = QHBoxLayout()
-			hlayout3.addWidget(self.max_val_lbls[i], 20)
-			hlayout3.addWidget(self.max_val_les[i], 80)			
-			sub_layout.addLayout(hlayout3)
 
 		self.enable_channels()
 		
@@ -139,10 +153,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		self.rgb_btn.toggled.connect(self.enable_channels)
 
 		self.hsep = QHSeperationLine()
-		sub_layout.addWidget(self.hsep)
-
-		hbox_frac = QHBoxLayout()
-		hbox_frac.addWidget(QLabel('fraction: '), 20)
 
 		self.fraction_slider = QLabeledDoubleSlider()
 		self.fraction_slider.setSingleStep(0.05)
@@ -152,13 +162,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		self.fraction_slider.setRange(0.1,1)
 		self.fraction_slider.setValue(0.25)
 
-		hbox_frac.addWidget(self.fraction_slider, 80)
-		sub_layout.addLayout(hbox_frac)
-
-
-		hbox_interval = QHBoxLayout()
-		hbox_interval.addWidget(QLabel('interval [ms]: '), 20)
-
 		self.interval_slider = QLabeledSlider()
 		self.interval_slider.setSingleStep(1)
 		self.interval_slider.setTickInterval(1)
@@ -166,29 +169,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		self.interval_slider.setOrientation(Qt.Horizontal)
 		self.interval_slider.setRange(1,1000)
 		self.interval_slider.setValue(1)
-		hbox_interval.addWidget(self.interval_slider, 80)
-		sub_layout.addLayout(hbox_interval)
-
-		self.main_layout.addLayout(sub_layout)
-
-		self.submit_btn = QPushButton('Save')
-		self.submit_btn.setStyleSheet(self.button_style_sheet)
-		self.submit_btn.clicked.connect(self.write_instructions)
-		self.main_layout.addWidget(self.submit_btn)
-
-
-		self.button_widget.adjustSize()
-		self.scroll_area.setAlignment(Qt.AlignCenter)
-		self.scroll_area.setWidget(self.button_widget)
-		self.scroll_area.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-		self.scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-		self.scroll_area.setWidgetResizable(True)
-		self.setCentralWidget(self.scroll_area)
-		self.show()
-
-		self.read_instructions()
-
-		QApplication.processEvents()
 
 	def enable_channels(self):
 
@@ -207,7 +187,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 				self.channel_cbs_lbls[k].setEnabled(False)
 
 			for k in range(3):
-
 				self.min_val_les[k].setEnabled(False)
 				self.min_val_lbls[k].setEnabled(False)
 				self.max_val_les[k].setEnabled(False)
@@ -219,7 +198,6 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 			self.percentile_btn.setEnabled(True)
 
 			for k in range(3):
-
 				self.channel_cbs[k].setEnabled(True)
 				self.channel_cbs_lbls[k].setEnabled(True)
 
@@ -256,7 +234,7 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 				self.max_val_lbls[k].setText('Max percentile: ')	
 				self.max_val_les[k].setText('99.99')
 
-	def write_instructions(self):
+	def _write_instructions(self):
 
 		"""
 		Save the current configuration.
@@ -267,7 +245,7 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		max_i = 3 if self.rgb_btn.isChecked() else 1
 		channels = []
 		for i in range(max_i):
-			channels.append([self.channel_cbs[i].currentText(), float(self.min_val_les[i].text()), float(self.max_val_les[i].text())])
+			channels.append([self.channel_cbs[i].currentText(), float(self.min_val_les[i].text().replace(',','.')), float(self.max_val_les[i].text().replace(',','.'))])
 		instructions.update({'channels': channels})
 		
 		print('Instructions: ', instructions)
@@ -277,7 +255,7 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 		print('Done.')
 		self.close()
 
-	def read_instructions(self):
+	def _load_previous_instructions(self):
 		
 		"""
 		Read and set the widgets to the last configuration.
@@ -312,8 +290,8 @@ class ConfigSignalAnnotator(CelldetectiveMainWindow):
 					for i in range(max_iter):
 						idx = self.channel_cbs[i].findText(channels[i][0])
 						self.channel_cbs[i].setCurrentIndex(idx)					
-						self.min_val_les[i].setText(str(channels[i][1]))
-						self.max_val_les[i].setText(str(channels[i][2]))
+						self.min_val_les[i].setText(str(channels[i][1]).replace('.',','))
+						self.max_val_les[i].setText(str(channels[i][2]).replace('.',','))
 
 				if 'fraction' in instructions:
 					fraction = instructions['fraction']

celldetective/gui/{btrack_options.py → settings/_settings_tracking.py}

@@ -1,8 +1,12 @@
-from PyQt5.QtWidgets import QRadioButton, QButtonGroup, QApplication, QMessageBox, QScrollArea, QComboBox, QFrame, QCheckBox, QFileDialog, QGridLayout, QTextEdit, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
+"""
+Copyright © 2023 Laboratoire Adhesion et Inflammation, Authored by Remy Torro.
+"""
+
+
+from PyQt5.QtWidgets import QRadioButton, QButtonGroup, QMessageBox, QComboBox, QFrame, QCheckBox, QFileDialog, QGridLayout, QTextEdit, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QDoubleValidator
 
-from celldetective.gui.gui_utils import center_window, FeatureChoice, ListWidget, QHSeperationLine, FigureCanvas, help_generic
+from celldetective.gui.gui_utils import FeatureChoice, ListWidget, QHSeperationLine, FigureCanvas, help_generic
 from superqt import QLabeledDoubleSlider, QLabeledSlider
 from superqt.fonticon import icon
 from fonticon_mdi6 import MDI6
@@ -16,10 +20,10 @@ import os
 import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 from glob import glob
-from celldetective.gui import CelldetectiveWidget, CelldetectiveMainWindow
+from celldetective.gui.settings._settings_base import CelldetectiveSettingsPanel
 
 
-class ConfigTracking(CelldetectiveMainWindow):
+class SettingsTracking(CelldetectiveSettingsPanel):
 	
 	"""
 	UI to set tracking parameters for bTrack.
@@ -28,46 +32,51 @@ class ConfigTracking(CelldetectiveMainWindow):
 
 	def __init__(self, parent_window=None):
 		
-		super().__init__()
 		self.parent_window = parent_window
-		self.setWindowTitle("Configure tracking")
 		self.mode = self.parent_window.mode
 		self.exp_dir = self.parent_window.exp_dir
-		self.floatValidator = QDoubleValidator()
 
 		self.config_name = os.sep.join(["configs", f"btrack_config_{self.mode}.json"])
 		self.track_instructions_write_path = self.parent_window.exp_dir + os.sep.join(["configs", f"tracking_instructions_{self.mode}.json"])
-		self.soft_path = get_software_location()
 		
 		self.config_path = self.exp_dir + self.config_name
 		self.channel_names, self.channels = extract_experiment_channels(self.exp_dir)
 		self.channel_names = np.array(self.channel_names)
 		self.channels = np.array(self.channels)
-		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
-
-		center_window(self)
-		self.setMinimumWidth(540)
 		self.minimum_height = 300
-		# self.setMinimumHeight(int(0.3*self.screen_height))
-		# self.setMaximumHeight(int(0.8*self.screen_height))
-		self.populate_widget()
-		self.load_previous_tracking_instructions()
 
-	def populate_widget(self):
+		super().__init__(title="Configure tracking")
+		
+		self._add_to_layout()
+		self._load_previous_instructions()
+		
+		self._widget.setMinimumWidth(500)
+		self._adjustSize()
+		self.resize(int(self.width()*1.5), int(self._screen_height * 0.8))
+	
+	def _add_to_layout(self):
+		
+		tracker_hbox = QHBoxLayout()
+		tracker_hbox.setContentsMargins(15, 15, 15, 15)
+		tracker_hbox.addWidget(self.btrack_option, 50, alignment=Qt.AlignCenter)
+		tracker_hbox.addWidget(self.trackpy_option, 50, alignment=Qt.AlignCenter)
+		
+		self._layout.addLayout(tracker_hbox)
+		self._layout.addWidget(self.config_frame)
+		self._layout.addWidget(self.features_frame)
+		self._layout.addWidget(self.config_trackpy_frame)
+		self._layout.addWidget(self.post_proc_frame)
+		self._layout.addWidget(self.submit_btn)
+
+
+	def _create_widgets(self):
 
 		"""
 		Create the multibox design with collapsable frames.
 
 		"""
 		
-		# Create button widget and layout
-		self.scroll_area = QScrollArea(self)
-		self.button_widget = CelldetectiveWidget()
-		main_layout = QVBoxLayout()
-		self.button_widget.setLayout(main_layout)
-		main_layout.setContentsMargins(30, 30, 30, 30)
-
-		# First collapsable Frame CONFIG
+		super()._create_widgets()
 
 		self.btrack_option = QRadioButton('bTrack')
 		self.btrack_option.setChecked(True)
@@ -81,69 +90,37 @@ class ConfigTracking(CelldetectiveMainWindow):
 		self.config_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_config_frame()
 
-		tracker_hbox = QHBoxLayout()
-		tracker_hbox.setContentsMargins(15, 15, 15, 15)
-		tracker_hbox.addWidget(self.btrack_option, 50, alignment=Qt.AlignCenter)
-		tracker_hbox.addWidget(self.trackpy_option, 50, alignment=Qt.AlignCenter)
-		main_layout.addLayout(tracker_hbox)
-
-		main_layout.addWidget(self.config_frame)
-
 		# Second collapsable frame FEATURES
 		self.features_frame = QFrame()
 		self.features_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_features_frame()
-		main_layout.addWidget(self.features_frame)
 
 		self.config_trackpy_frame = QFrame()
 		self.config_trackpy_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_config_trackpy_frame()
-		main_layout.addWidget(self.config_trackpy_frame)
 		self.config_trackpy_frame.hide()
 
 		# Third collapsable frame POST-PROCESSING
 		self.post_proc_frame = QFrame()
 		self.post_proc_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_post_proc_frame()
-		main_layout.addWidget(self.post_proc_frame)
-
-		self.submit_btn = QPushButton('Save')
-		self.submit_btn.setStyleSheet(self.parent_window.parent_window.parent_window.button_style_sheet)
-		self.submit_btn.clicked.connect(self.write_instructions)
-		main_layout.addWidget(self.submit_btn)
-
-		#self.populate_left_panel()
-		#grid.addLayout(self.left_side, 0, 0, 1, 1)
-		self.button_widget.adjustSize()
-
-		self.scroll_area.setAlignment(Qt.AlignCenter)
-		self.scroll_area.setWidget(self.button_widget)
-		self.scroll_area.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-		self.scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-		self.scroll_area.setWidgetResizable(True)
-		self.setCentralWidget(self.scroll_area)
-		self.show()
 
 		self.btrack_option.toggled.connect(self.show_tracking_options)
 		self.trackpy_option.toggled.connect(self.show_tracking_options)
 
-		QApplication.processEvents()
-		self.adjustScrollArea()
-
 	def show_tracking_options(self):
 
 		if self.btrack_option.isChecked():
 			self.config_frame.show()
 			self.features_frame.show()
 			self.config_trackpy_frame.hide()
-			#self.scroll_area.setMinimumHeight(min(int(930), int(0.9*self.screen_height)))
-			#self.adjustSize()
+			#self._adjustSize()
 		else:
 			self.config_frame.hide()
 			self.features_frame.hide()
 			self.config_trackpy_frame.show()
-			#self.scroll_area.setMinimumHeight(self.minimum_height)
-			#self.adjustSize()
+			#self._adjustSize()
+	
 
 	def populate_post_proc_frame(self):
 
@@ -203,12 +180,12 @@ class ConfigTracking(CelldetectiveMainWindow):
 			self.collapse_post_proc_btn.setIcon(icon(MDI6.chevron_down, color="black"))
 			self.collapse_post_proc_btn.setIconSize(QSize(20, 20))
 			if len(is_open[is_open])==0:
-				self.scroll_area.setMinimumHeight(int(self.minimum_height))
-				self.adjustSize()
+				pass
+				#self._scroll_area.setMinimumHeight(int(self.minimum_height))
+				#self._adjustSize()
 		else:
 			self.collapse_post_proc_btn.setIcon(icon(MDI6.chevron_up, color="black"))
 			self.collapse_post_proc_btn.setIconSize(QSize(20, 20))
-			self.scroll_area.setMinimumHeight(min(int(930), int(0.9*self.screen_height)))
 
 
 	def help_post(self):
@@ -319,12 +296,12 @@ class ConfigTracking(CelldetectiveMainWindow):
 			self.collapse_features_btn.setIcon(icon(MDI6.chevron_down, color="black"))
 			self.collapse_features_btn.setIconSize(QSize(20, 20))
 			if len(is_open[is_open])==0:
-				self.scroll_area.setMinimumHeight(int(self.minimum_height))
-				self.adjustSize()
+				pass
+				#self._scroll_area.setMinimumHeight(int(self.minimum_height))
+				#self._adjustSize()
 		else:
 			self.collapse_features_btn.setIcon(icon(MDI6.chevron_up, color="black"))
 			self.collapse_features_btn.setIconSize(QSize(20, 20))
-			self.scroll_area.setMinimumHeight(min(int(930), int(0.9*self.screen_height)))
 
 
 	def generate_post_proc_panel_contents(self):
@@ -614,12 +591,12 @@ class ConfigTracking(CelldetectiveMainWindow):
 			self.collapse_config_btn.setIcon(icon(MDI6.chevron_down,color="black"))
 			self.collapse_config_btn.setIconSize(QSize(20, 20))
 			if len(is_open[is_open])==0:
-				self.scroll_area.setMinimumHeight(int(self.minimum_height))
-				self.adjustSize()
+				pass
+				#self._scroll_area.setMinimumHeight(int(self.minimum_height))
+				#self._adjustSize()
 		else:
 			self.collapse_config_btn.setIcon(icon(MDI6.chevron_up,color="black"))
 			self.collapse_config_btn.setIconSize(QSize(20, 20))
-			self.scroll_area.setMinimumHeight(min(int(930), int(0.9*self.screen_height)))
 
 	def collapse_config_trackpy_advanced(self):
 
@@ -635,12 +612,12 @@ class ConfigTracking(CelldetectiveMainWindow):
 			self.collapse_config_trackpy_btn.setIcon(icon(MDI6.chevron_down,color="black"))
 			self.collapse_config_trackpy_btn.setIconSize(QSize(20, 20))
 			if len(is_open[is_open])==0:
-				self.scroll_area.setMinimumHeight(int(self.minimum_height))
-				self.adjustSize()
+				pass
+				#self._scroll_area.setMinimumHeight(int(self.minimum_height))
+				#self._adjustSize()
 		else:
 			self.collapse_config_trackpy_btn.setIcon(icon(MDI6.chevron_up,color="black"))
 			self.collapse_config_trackpy_btn.setIconSize(QSize(20, 20))
-			self.scroll_area.setMinimumHeight(min(int(930), int(0.9*self.screen_height)))
 
 
 	def generate_config_trackpy_panel_contents(self):
@@ -653,7 +630,7 @@ class ConfigTracking(CelldetectiveMainWindow):
 		self.search_range_lbl = QLabel("search range [px]: ")
 		self.search_range_le = QLineEdit('30')
 		self.search_range_le.setPlaceholderText('search distance in pixels')
-		self.search_range_le.setValidator(self.floatValidator)
+		self.search_range_le.setValidator(self._floatValidator)
 		sr_layout.addWidget(self.search_range_lbl, 30)
 		sr_layout.addWidget(self.search_range_le, 70)
 		layout.addLayout(sr_layout)
@@ -731,7 +708,7 @@ class ConfigTracking(CelldetectiveMainWindow):
 
 		self.file_dialog = QFileDialog()
 		try:
-			modelpath = os.sep.join([self.soft_path, "celldetective","models","tracking_configs"]) + os.sep
+			modelpath = os.sep.join([self._software_path, "celldetective","models","tracking_configs"]) + os.sep
 			print("Track config path: ", modelpath)
 			self.filename = self.file_dialog.getOpenFileName(None, "Load config", modelpath, "json files (*.json)")[0]
 			if self.filename!=self.config_path:
@@ -822,16 +799,16 @@ class ConfigTracking(CelldetectiveMainWindow):
 		else:
 			self.post_proc_ticked = True	
 
-	def adjustScrollArea(self):
-		
-		"""
-		Auto-adjust scroll area to fill space 
-		(from https://stackoverflow.com/questions/66417576/make-qscrollarea-use-all-available-space-of-qmainwindow-height-axis)
-		"""
-
-		step = 5
-		while self.scroll_area.verticalScrollBar().isVisible() and self.height() < self.maximumHeight():
-			self.resize(self.width(), self.height() + step)
+	# def adjustScrollArea(self):
+	#
+	# 	"""
+	# 	Auto-adjust scroll area to fill space
+	# 	(from https://stackoverflow.com/questions/66417576/make-qscrollarea-use-all-available-space-of-qmainwindow-height-axis)
+	# 	"""
+	#
+	# 	step = 5
+	# 	while self._scroll_area.verticalScrollBar().isVisible() and self.height() < self.maximumHeight():
+	# 		self.resize(self.width(), self.height() + step)
 
 	def load_cell_config(self):
 
@@ -844,7 +821,7 @@ class ConfigTracking(CelldetectiveMainWindow):
 			json_data = json.load(f)
 			self.config_le.setText(json.dumps(json_data, indent=4))
 
-	def write_instructions(self):
+	def _write_instructions(self):
 
 		"""
 		Write the selected options in a json file for later reading by the software.
@@ -953,7 +930,7 @@ class ConfigTracking(CelldetectiveMainWindow):
 		else:
 			self.haralick_options = None		
 
-	def load_previous_tracking_instructions(self):
+	def _load_previous_instructions(self):
 
 		"""
 		Read the tracking options from a previously written json file.

celldetective/gui/styles.py

@@ -14,7 +14,8 @@ class Styles(object):
 
 		
 		self.celldetective_blue = "#1565c0"
-		self.celldetective_icon = QIcon(os.sep.join([get_software_location(),'celldetective','icons','logo.png']))
+		self.celldetective_logo_path = os.sep.join([get_software_location(),'celldetective','icons','logo.png'])
+		self.celldetective_icon = QIcon(self.celldetective_logo_path)
 
 		self.action_lbl_style_sheet = """
 			font-size: 10px;

celldetective/gui/survival_ui.py

@@ -1,4 +1,4 @@
-from PyQt5.QtWidgets import QMessageBox, QComboBox, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
+from PyQt5.QtWidgets import QComboBox, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QDoubleValidator
 from celldetective.gui.gui_utils import center_window, generic_message

celldetective/gui/tableUI.py

@@ -3,6 +3,9 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QBrush, QColor, QDoubleValidator
 import pandas as pd
 import matplotlib.pyplot as plt
+
+from celldetective.gui.table_ops.merge_groups import MergeGroupWidget
+
 plt.rcParams['svg.fonttype'] = 'none'
 from celldetective.gui.gui_utils import FigureCanvas, center_window, QHSeperationLine, GenericOpColWidget, PandasModel
 from celldetective.utils import differentiate_per_track, collapse_trajectories_by_status, test_2samp_generic, safe_log
@@ -650,11 +653,17 @@ class TableUI(CelldetectiveMainWindow):
 		self.calibrate_action.triggered.connect(self.calibrate_selected_feature)
 		self.calibrate_action.setShortcut("Ctrl+C")
 		self.mathMenu.addAction(self.calibrate_action)
+		
+		self.merge_classification_action = QAction('&Merge states...', self)
+		self.merge_classification_action.triggered.connect(self.merge_classification_features)
+		self.mathMenu.addAction(self.merge_classification_action)
 
 		self.derivative_action = QAction('&Differentiate...', self)
 		self.derivative_action.triggered.connect(self.differenciate_selected_feature)
 		self.derivative_action.setShortcut("Ctrl+D")
 		self.mathMenu.addAction(self.derivative_action)
+		if not self.tracks:
+			self.derivative_action.setEnabled(False)
 
 		self.abs_action = QAction('&Absolute value...', self)
 		self.abs_action.triggered.connect(self.take_abs_of_selected_feature)
@@ -993,6 +1002,22 @@ class TableUI(CelldetectiveMainWindow):
 
 		self.LogWidget = LogColWidget(self, selected_col)
 		self.LogWidget.show()
+		
+	def merge_classification_features(self):
+		
+		x = self.table_view.selectedIndexes()
+		col_idx = np.unique(np.array([l.column() for l in x]))
+		
+		col_selection = []
+		if isinstance(col_idx, (list, np.ndarray)):
+			cols = np.array(list(self.data.columns))
+			if len(col_idx) > 0:
+				selected_cols = cols[col_idx]
+				col_selection.extend(selected_cols)
+		
+		self.merge_classification_widget = MergeGroupWidget(self, columns = col_selection)
+		self.merge_classification_widget.show()
+
 
 	def calibrate_selected_feature(self):