celldetective 1.0.2.post1__py3-none-any.whl → 1.1.1__py3-none-any.whl

celldetective/gui/thresholds_gui.py

@@ -12,7 +12,7 @@ from skimage.morphology import disk
 
 from celldetective.filters import std_filter, gauss_filter
 from celldetective.gui.gui_utils import center_window, FigureCanvas, ListWidget, FilterChoice, color_from_class
-from celldetective.utils import get_software_location, extract_experiment_channels, rename_intensity_column
+from celldetective.utils import get_software_location, extract_experiment_channels, rename_intensity_column, estimate_unreliable_edge
 from celldetective.io import auto_load_number_of_frames, load_frames
 from celldetective.segmentation import threshold_image, identify_markers_from_binary, apply_watershed, \
 	segment_frame_from_thresholds
@@ -30,19 +30,21 @@ from skimage.measure import regionprops_table
 import json
 import os
 
+from celldetective.gui.viewers import StackVisualizer
+from celldetective.gui import Styles
 
-class ThresholdConfigWizard(QMainWindow):
+class ThresholdConfigWizard(QMainWindow, Styles):
 	"""
 	UI to create a threshold pipeline for segmentation.
 
 	"""
 
-	def __init__(self, parent=None):
+	def __init__(self, parent_window=None):
 
 		super().__init__()
-		self.parent = parent
-		self.screen_height = self.parent.parent.parent.parent.screen_height
-		self.screen_width = self.parent.parent.parent.parent.screen_width
+		self.parent_window = parent_window
+		self.screen_height = self.parent_window.parent_window.parent_window.parent_window.screen_height
+		self.screen_width = self.parent_window.parent_window.parent_window.parent_window.screen_width
 		self.setMinimumWidth(int(0.8 * self.screen_width))
 		self.setMinimumHeight(int(0.8 * self.screen_height))
 		self.setWindowTitle("Threshold configuration wizard")
@@ -50,15 +52,16 @@ class ThresholdConfigWizard(QMainWindow):
 		self._createActions()
 		self._createMenuBar()
 
-		self.mode = self.parent.mode
-		self.pos = self.parent.parent.parent.pos
-		self.exp_dir = self.parent.parent.exp_dir
+		self.mode = self.parent_window.mode
+		self.pos = self.parent_window.parent_window.parent_window.pos
+		self.exp_dir = self.parent_window.parent_window.exp_dir
 		self.soft_path = get_software_location()
 		self.footprint = 30
 		self.min_dist = 30
 		self.onlyFloat = QDoubleValidator()
 		self.onlyInt = QIntValidator()
 		self.cell_properties = ['centroid', 'area', 'perimeter', 'eccentricity', 'intensity_mean', 'solidity']
+		self.edge = None
 
 		if self.mode == "targets":
 			self.config_out_name = "threshold_targets.json"
@@ -157,14 +160,14 @@ class ThresholdConfigWizard(QMainWindow):
 		filter_list_option_grid.addWidget(section_preprocess, 90, alignment=Qt.AlignLeft)
 
 		self.delete_filter = QPushButton("")
-		self.delete_filter.setStyleSheet(self.parent.parent.parent.parent.button_select_all)
+		self.delete_filter.setStyleSheet(self.button_select_all)
 		self.delete_filter.setIcon(icon(MDI6.trash_can, color="black"))
 		self.delete_filter.setToolTip("Remove filter")
 		self.delete_filter.setIconSize(QSize(20, 20))
 		self.delete_filter.clicked.connect(self.filters_qlist.removeSel)
 
 		self.add_filter = QPushButton("")
-		self.add_filter.setStyleSheet(self.parent.parent.parent.parent.button_select_all)
+		self.add_filter.setStyleSheet(self.button_select_all)
 		self.add_filter.setIcon(icon(MDI6.filter_plus, color="black"))
 		self.add_filter.setToolTip("Add filter")
 		self.add_filter.setIconSize(QSize(20, 20))
@@ -180,7 +183,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.apply_filters_btn = QPushButton("Apply")
 		self.apply_filters_btn.setIcon(icon(MDI6.filter_cog_outline, color="white"))
 		self.apply_filters_btn.setIconSize(QSize(20, 20))
-		self.apply_filters_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.apply_filters_btn.setStyleSheet(self.button_style_sheet)
 		self.apply_filters_btn.clicked.connect(self.preprocess_image)
 		grid_preprocess.addWidget(self.apply_filters_btn, 2, 0, 1, 3)
 
@@ -201,14 +204,14 @@ class ThresholdConfigWizard(QMainWindow):
 
 		self.ylog_check = QPushButton("")
 		self.ylog_check.setIcon(icon(MDI6.math_log, color="black"))
-		self.ylog_check.setStyleSheet(self.parent.parent.parent.parent.button_select_all)
+		self.ylog_check.setStyleSheet(self.button_select_all)
 		self.ylog_check.clicked.connect(self.switch_to_log)
 		threshold_title_grid.addWidget(self.ylog_check, 5)
 
 		self.equalize_option_btn = QPushButton("")
 		self.equalize_option_btn.setIcon(icon(MDI6.equalizer, color="black"))
 		self.equalize_option_btn.setIconSize(QSize(20, 20))
-		self.equalize_option_btn.setStyleSheet(self.parent.parent.parent.parent.button_select_all)
+		self.equalize_option_btn.setStyleSheet(self.button_select_all)
 		self.equalize_option_btn.setToolTip("Enable histogram matching")
 		self.equalize_option_btn.clicked.connect(self.activate_histogram_equalizer)
 		self.equalize_option = False
@@ -223,7 +226,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.threshold_slider.setTickInterval(0.00001)
 		self.threshold_slider.setOrientation(1)
 		self.threshold_slider.setDecimals(3)
-		self.threshold_slider.setRange(np.amin(self.img), np.amax(self.img))
+		self.threshold_slider.setRange(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.threshold_slider.setValue([np.percentile(self.img.flatten(), 90), np.amax(self.img)])
 		self.threshold_slider.valueChanged.connect(self.threshold_changed)
 
@@ -246,7 +249,7 @@ class ThresholdConfigWizard(QMainWindow):
 		#################
 
 		self.save_btn = QPushButton('Save')
-		self.save_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.save_btn.setStyleSheet(self.button_style_sheet)
 		self.save_btn.clicked.connect(self.write_instructions)
 		self.left_panel.addWidget(self.save_btn)
 
@@ -290,14 +293,14 @@ class ThresholdConfigWizard(QMainWindow):
 
 		self.markers_btn = QPushButton("Run")
 		self.markers_btn.clicked.connect(self.detect_markers)
-		self.markers_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.markers_btn.setStyleSheet(self.button_style_sheet)
 		hbox_marker_btns.addWidget(self.markers_btn)
 
 		self.watershed_btn = QPushButton("Watershed")
 		self.watershed_btn.setIcon(icon(MDI6.waves_arrow_up, color="white"))
 		self.watershed_btn.setIconSize(QSize(20, 20))
 		self.watershed_btn.clicked.connect(self.apply_watershed_to_selection)
-		self.watershed_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.watershed_btn.setStyleSheet(self.button_style_sheet)
 		self.watershed_btn.setEnabled(False)
 		hbox_marker_btns.addWidget(self.watershed_btn)
 		marker_box.addLayout(hbox_marker_btns)
@@ -329,7 +332,7 @@ class ThresholdConfigWizard(QMainWindow):
 			'eliminate points using a query such as: area > 100 or eccentricity > 0.95')
 		hbox_classify.addWidget(self.property_query_le, 70)
 		self.submit_query_btn = QPushButton('Submit...')
-		self.submit_query_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.submit_query_btn.setStyleSheet(self.button_style_sheet)
 		self.submit_query_btn.clicked.connect(self.apply_property_query)
 		hbox_classify.addWidget(self.submit_query_btn, 20)
 		properties_box.addLayout(hbox_classify)
@@ -367,7 +370,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.contrast_slider.setSingleStep(0.00001)
 		self.contrast_slider.setTickInterval(0.00001)
 		self.contrast_slider.setOrientation(1)
-		self.contrast_slider.setRange(np.amin(self.img), np.amax(self.img))
+		self.contrast_slider.setRange(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.contrast_slider.setValue([np.percentile(self.img.flatten(), 1), np.percentile(self.img.flatten(), 99.99)])
 		self.contrast_slider.valueChanged.connect(self.contrast_slider_action)
 		contrast_hbox.addWidget(QLabel('contrast: '))
@@ -383,7 +386,7 @@ class ThresholdConfigWizard(QMainWindow):
 
 		print("this is the loaded position: ", self.pos)
 		if isinstance(self.pos, str):
-			movies = glob(self.pos + f"movie/{self.parent.parent.parent.movie_prefix}*.tif")
+			movies = glob(self.pos + f"movie/{self.parent_window.parent_window.parent_window.movie_prefix}*.tif")
 
 		else:
 			msgBox = QMessageBox()
@@ -392,10 +395,9 @@ class ThresholdConfigWizard(QMainWindow):
 			msgBox.setWindowTitle("Warning")
 			msgBox.setStandardButtons(QMessageBox.Ok)
 			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Ok:
-				self.img = None
-				self.close()
-				return None
+			self.img = None
+			self.close()
+			return None
 
 		if len(movies) == 0:
 			msgBox = QMessageBox()
@@ -404,11 +406,11 @@ class ThresholdConfigWizard(QMainWindow):
 			msgBox.setWindowTitle("Warning")
 			msgBox.setStandardButtons(QMessageBox.Ok)
 			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Yes:
-				self.close()
+			self.img = None
+			self.close()
 		else:
 			self.stack_path = movies[0]
-			self.len_movie = self.parent.parent.parent.len_movie
+			self.len_movie = self.parent_window.parent_window.parent_window.len_movie
 			len_movie_auto = auto_load_number_of_frames(self.stack_path)
 			if len_movie_auto is not None:
 				self.len_movie = len_movie_auto
@@ -436,7 +438,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.im = self.ax.imshow(self.img, cmap='gray')
 
 		self.binary = threshold_image(self.img, self.threshold_slider.value()[0], self.threshold_slider.value()[1],
-									  foreground_value=255., fill_holes=False)
+									  foreground_value=1., fill_holes=True, edge_exclusion=None)
 		self.thresholded_image = np.ma.masked_where(self.binary == 0., self.binary)
 		self.image_thresholded = self.ax.imshow(self.thresholded_image, cmap="viridis", alpha=0.5, interpolation='none')
 
@@ -480,10 +482,10 @@ class ThresholdConfigWizard(QMainWindow):
 		self.ax_hist.spines['top'].set_visible(False)
 		self.ax_hist.spines['right'].set_visible(False)
 		# self.ax_hist.set_yticks([])
-		self.ax_hist.set_xlim(np.amin(self.img), np.amax(self.img))
+		self.ax_hist.set_xlim(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.ax_hist.set_ylim(0, self.hist_y.max())
 
-		self.threshold_slider.setRange(np.amin(self.img), np.amax(self.img))
+		self.threshold_slider.setRange(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.threshold_slider.setValue([np.nanpercentile(self.img.flatten(), 90), np.amax(self.img)])
 		self.add_hist_threshold()
 
@@ -505,12 +507,12 @@ class ThresholdConfigWizard(QMainWindow):
 		self.ax_hist.spines['top'].set_visible(False)
 		self.ax_hist.spines['right'].set_visible(False)
 		# self.ax_hist.set_yticks([])
-		self.ax_hist.set_xlim(np.amin(self.img), np.amax(self.img))
+		self.ax_hist.set_xlim(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.ax_hist.set_ylim(0, self.hist_y.max())
 		self.add_hist_threshold()
 		self.canvas_hist.canvas.draw()
 
-		self.threshold_slider.setRange(np.amin(self.img), np.amax(self.img))
+		self.threshold_slider.setRange(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.threshold_slider.setValue([np.nanpercentile(self.img.flatten(), 90), np.amax(self.img)])
 		self.threshold_changed(self.threshold_slider.value())
 
@@ -571,7 +573,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.vmax = np.nanpercentile(self.img.flatten(), 99.)
 
 		self.contrast_slider.disconnect()
-		self.contrast_slider.setRange(np.amin(self.img), np.amax(self.img))
+		self.contrast_slider.setRange(np.amin(self.img[self.img==self.img]), np.amax(self.img[self.img==self.img]))
 		self.contrast_slider.setValue([self.vmin, self.vmax])
 		self.contrast_slider.valueChanged.connect(self.contrast_slider_action)
 
@@ -590,6 +592,7 @@ class ThresholdConfigWizard(QMainWindow):
 
 		self.reload_frame()
 		filters = self.filters_qlist.items
+		self.edge = estimate_unreliable_edge(filters)
 		self.img = filter_image(self.img, filters)
 		self.refresh_imshow()
 		self.update_histogram()
@@ -636,7 +639,7 @@ class ThresholdConfigWizard(QMainWindow):
 		"""
 
 		self.binary = threshold_image(self.img, self.threshold_slider.value()[0], self.threshold_slider.value()[1],
-									  foreground_value=255., fill_holes=False)
+									  foreground_value=1., fill_holes=True, edge_exclusion=self.edge)
 		self.thresholded_image = np.ma.masked_where(self.binary == 0., self.binary)
 		self.image_thresholded.set_data(self.thresholded_image)
 		self.fcanvas.canvas.draw_idle()
@@ -657,7 +660,7 @@ class ThresholdConfigWizard(QMainWindow):
 
 		if self.binary.ndim == 3:
 			self.binary = np.squeeze(self.binary)
-		self.binary = binary_fill_holes(self.binary)
+		#self.binary = binary_fill_holes(self.binary)
 		self.coords, self.edt_map = identify_markers_from_binary(self.binary, self.min_dist,
 																 footprint_size=self.footprint, footprint=None,
 																 return_edt=True)
@@ -784,7 +787,7 @@ class ThresholdConfigWizard(QMainWindow):
 		self.property_query_le.setText('')
 
 		self.binary = threshold_image(self.img, self.threshold_slider.value()[0], self.threshold_slider.value()[1],
-									  foreground_value=255., fill_holes=False)
+									  foreground_value=1., fill_holes=True, edge_exclusion=self.edge)
 		self.thresholded_image = np.ma.masked_where(self.binary == 0., self.binary)
 
 		self.scat_markers.set_color('tab:red')
@@ -815,9 +818,9 @@ class ThresholdConfigWizard(QMainWindow):
 				outfile.write(json_object)
 			print("Configuration successfully written in ", self.instruction_file)
 
-			self.parent.filename = self.instruction_file
-			self.parent.file_label.setText(self.instruction_file[:16] + '...')
-			self.parent.file_label.setToolTip(self.instruction_file)
+			self.parent_window.filename = self.instruction_file
+			self.parent_window.file_label.setText(self.instruction_file[:16] + '...')
+			self.parent_window.file_label.setToolTip(self.instruction_file)
 
 			self.close()
 		else:
@@ -872,11 +875,11 @@ class ThresholdConfigWizard(QMainWindow):
 
 
 class ThresholdNormalisation(ThresholdConfigWizard):
-	def __init__(self, min_threshold, current_channel, parent=None):
+	def __init__(self, min_threshold, current_channel, parent_window=None):
 		QMainWindow.__init__(self)
-		self.parent = parent
-		self.screen_height = self.parent.parent.parent.parent.screen_height
-		self.screen_width = self.parent.parent.parent.parent.screen_width
+		self.parent_window = parent_window
+		self.screen_height = self.parent_window.parent_window.parent_window.parent_window.screen_height
+		self.screen_width = self.parent_window.parent_window.parent_window.parent_window.screen_width
 		self.setMaximumWidth(int(self.screen_width // 3))
 		self.setMinimumHeight(int(0.8 * self.screen_height))
 		self.setWindowTitle("Normalisation threshold preview")
@@ -884,9 +887,9 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 		self.img = None
 		self.min_threshold = min_threshold
 		self.current_channel = current_channel
-		self.mode = self.parent.mode
-		self.pos = self.parent.parent.parent.pos
-		self.exp_dir = self.parent.parent.exp_dir
+		self.mode = self.parent_window.mode
+		self.pos = self.parent_window.parent_window.parent_window.pos
+		self.exp_dir = self.parent_window.parent_window.exp_dir
 		self.soft_path = get_software_location()
 		self.auto_close = False
 
@@ -945,7 +948,7 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 		self.contrast_slider.setSingleStep(0.00001)
 		self.contrast_slider.setTickInterval(0.00001)
 		self.contrast_slider.setOrientation(1)
-		self.contrast_slider.setRange(np.amin(self.frame), np.amax(self.frame))
+		self.contrast_slider.setRange(np.amin(self.frame[self.frame==self.frame]), np.amax(self.frame[self.frame==self.frame]))
 		self.contrast_slider.setValue(
 			[np.percentile(self.frame.flatten(), 1), np.percentile(self.frame.flatten(), 99.99)])
 		self.contrast_slider.valueChanged.connect(self.contrast_slider_action)
@@ -954,11 +957,11 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 		contrast_slider_layout.addWidget(self.contrast_slider)
 
 		self.submit_threshold_btn = QPushButton('Submit')
-		self.submit_threshold_btn.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet_2)
+		self.submit_threshold_btn.setStyleSheet(self.button_style_sheet_2)
 		self.submit_threshold_btn.clicked.connect(self.get_threshold)
 		self.ylog_check = QPushButton("")
 		self.ylog_check.setIcon(icon(MDI6.math_log, color="black"))
-		self.ylog_check.setStyleSheet(self.parent.parent.parent.parent.button_select_all)
+		self.ylog_check.setStyleSheet(self.button_select_all)
 		self.ylog_check.clicked.connect(self.switch_to_log)
 		self.ylog_check.setMaximumWidth(30)
 		log_button = QHBoxLayout()
@@ -989,11 +992,11 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 		self.ax_hist.set_xlabel('intensity [a.u.]')
 		self.ax_hist.spines['top'].set_visible(False)
 		self.ax_hist.spines['right'].set_visible(False)
-		self.ax_hist.set_xlim(np.amin(self.frame), np.amax(self.frame))
+		self.ax_hist.set_xlim(np.amin(self.frame[self.frame==self.frame]), np.amax(self.frame[self.frame==self.frame]))
 		self.ax_hist.set_ylim(0, self.hist_y.max())
 		self.threshold_slider.setSingleStep(0.001)
 		self.threshold_slider.setTickInterval(0.001)
-		self.threshold_slider.setRange(np.amin(self.frame), np.amax(self.frame))
+		self.threshold_slider.setRange(np.amin(self.frame[self.frame==self.frame]), np.amax(self.frame[self.frame==self.frame]))
 		self.threshold_slider.setValue(np.percentile(self.frame,90))
 		self.add_hist_threshold()
 
@@ -1054,7 +1057,7 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 		"""
 
 		if isinstance(self.pos, str):
-			movies = glob(self.pos + f"movie/{self.parent.parent.parent.movie_prefix}*.tif")
+			movies = glob(self.pos + f"movie/{self.parent_window.parent_window.parent_window.movie_prefix}*.tif")
 		else:
 			msgBox = QMessageBox()
 			msgBox.setIcon(QMessageBox.Warning)
@@ -1080,7 +1083,7 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 				return None
 		else:
 			self.stack_path = movies[0]
-			self.len_movie = self.parent.parent.parent.len_movie
+			self.len_movie = self.parent_window.parent_window.parent_window.len_movie
 			len_movie_auto = auto_load_number_of_frames(self.stack_path)
 			if len_movie_auto is not None:
 				self.len_movie = len_movie_auto
@@ -1096,24 +1099,24 @@ class ThresholdNormalisation(ThresholdConfigWizard):
 			print(f'{self.stack_path} successfully located.')
 
 	def get_threshold(self):
-		self.parent.tab2_txt_threshold.setText(str(self.threshold_slider.value()))
+		self.parent_window.tab2_txt_threshold.setText(str(self.threshold_slider.value()))
 		self.close()
 
 
 class ThresholdSpot(ThresholdConfigWizard):
-	def __init__(self, current_channel, img, mask, parent=None):
+	def __init__(self, current_channel, img, mask, parent_window=None):
 		QMainWindow.__init__(self)
-		self.parent = parent
-		self.screen_height = self.parent.parent.parent.parent.screen_height
-		self.screen_width = self.parent.parent.parent.parent.screen_width
+		self.parent_window = parent_window
+		self.screen_height = self.parent_window.parent_window.parent_window.parent_window.screen_height
+		self.screen_width = self.parent_window.parent_window.parent_window.parent_window.screen_width
 		self.setMinimumHeight(int(0.8 * self.screen_height))
 		self.setWindowTitle("Spot threshold preview")
 		center_window(self)
 		self.img = img
 		self.current_channel = current_channel
-		self.mode = self.parent.mode
-		self.pos = self.parent.parent.parent.pos
-		self.exp_dir = self.parent.parent.exp_dir
+		self.mode = self.parent_window.mode
+		self.pos = self.parent_window.parent_window.parent_window.pos
+		self.exp_dir = self.parent_window.parent_window.exp_dir
 		self.onlyFloat = QDoubleValidator()
 		self.onlyInt = QIntValidator()
 		self.soft_path = get_software_location()
@@ -1135,7 +1138,7 @@ class ThresholdSpot(ThresholdConfigWizard):
 		diameter_layout=QHBoxLayout()
 		self.diameter_lbl = QLabel('Spot diameter: ')
 		self.diameter_value = QLineEdit()
-		self.diameter_value.setText(self.parent.diameter_value.text())
+		self.diameter_value.setText(self.parent_window.diameter_value.text())
 		self.diameter_value.setValidator(self.onlyFloat)
 		diameter_layout.addWidget(self.diameter_lbl, alignment=Qt.AlignCenter)
 		diameter_layout.addWidget(self.diameter_value, alignment=Qt.AlignCenter)
@@ -1144,7 +1147,7 @@ class ThresholdSpot(ThresholdConfigWizard):
 		self.threshold_lbl = QLabel('Spot threshold: ')
 		self.threshold_value = QLineEdit()
 		self.threshold_value.setValidator(self.onlyFloat)
-		self.threshold_value.setText(self.parent.threshold_value.text())
+		self.threshold_value.setText(self.parent_window.threshold_value.text())
 		threshold_layout.addWidget(self.threshold_lbl, alignment=Qt.AlignCenter)
 		threshold_layout.addWidget(self.threshold_value, alignment=Qt.AlignCenter)
 		self.left_layout.addLayout(threshold_layout)
@@ -1162,14 +1165,14 @@ class ThresholdSpot(ThresholdConfigWizard):
 	def draw_spot_preview(self):
 
 		try:
-			diameter_value = float(self.parent.diameter_value.text().replace(',','.'))
+			diameter_value = float(self.parent_window.diameter_value.text().replace(',','.'))
 		except:
 			print('Diameter could not be converted to float... Abort.')
 			self.auto_close = True
 			return None
 
 		try:
-			threshold_value = float(self.parent.threshold_value.text().replace(',','.'))
+			threshold_value = float(self.parent_window.threshold_value.text().replace(',','.'))
 		except:
 			print('Threshold could not be converted to float... Abort.')
 			self.auto_close = True
@@ -1212,7 +1215,8 @@ class ThresholdSpot(ThresholdConfigWizard):
 		self.contrast_slider.setSingleStep(0.00001)
 		self.contrast_slider.setTickInterval(0.00001)
 		self.contrast_slider.setOrientation(1)
-		self.contrast_slider.setRange(np.amin(self.frame[:, :, self.current_channel]), np.amax(self.frame[:, :, self.current_channel]))
+		selection = self.frame[:, :, self.current_channel]
+		self.contrast_slider.setRange(np.amin(selection[selection==selection]), np.amax(selection[selection==selection]))
 		self.contrast_slider.setValue(
 			[np.percentile(self.frame[:, :, self.current_channel].flatten(), 1), np.percentile(self.frame[:, :, self.current_channel].flatten(), 99.99)])
 		self.contrast_slider.valueChanged.connect(self.contrast_slider_action)
@@ -1221,9 +1225,9 @@ class ThresholdSpot(ThresholdConfigWizard):
 		contrast_slider_layout.addWidget(self.contrast_slider)
 		self.preview_button=QPushButton("Preview")
 		self.preview_button.clicked.connect(self.update_spots)
-		self.preview_button.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet_2)
+		self.preview_button.setStyleSheet(self.button_style_sheet_2)
 		self.apply_changes=QPushButton("Apply")
-		self.apply_changes.setStyleSheet(self.parent.parent.parent.parent.button_style_sheet)
+		self.apply_changes.setStyleSheet(self.button_style_sheet)
 		self.apply_changes.clicked.connect(self.apply)
 
 		self.diameter_value.textChanged.connect(self.enable_preview)
@@ -1291,8 +1295,8 @@ class ThresholdSpot(ThresholdConfigWizard):
 
 
 	def apply(self):
-		self.parent.threshold_value.setText(self.threshold_value.text())
-		self.parent.diameter_value.setText(self.diameter_value.text())
+		self.parent_window.threshold_value.setText(self.threshold_value.text())
+		self.parent_window.diameter_value.setText(self.diameter_value.text())
 		self.close()