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

celldetective/gui/retrain_segmentation_model_options.py

@@ -21,22 +21,23 @@ from tifffile import imread
 from pathlib import Path, PurePath
 from datetime import datetime
 from functools import partial
+from celldetective.gui import Styles
 
-class ConfigSegmentationModelTraining(QMainWindow):
+class ConfigSegmentationModelTraining(QMainWindow, Styles):
 	
 	"""
 	UI to set segmentation model training instructions.
 
 	"""
 
-	def __init__(self, parent=None):
+	def __init__(self, parent_window=None):
 		
 		super().__init__()
-		self.parent = parent
+		self.parent_window = parent_window
 		self.setWindowTitle("Train segmentation model")
 		self.setWindowIcon(QIcon(os.sep.join(['celldetective','icons','mexican-hat.png'])))
-		self.mode = self.parent.mode
-		self.exp_dir = self.parent.exp_dir
+		self.mode = self.parent_window.mode
+		self.exp_dir = self.parent_window.exp_dir
 		self.soft_path = get_software_location()
 		self.pretrained_model = None 
 		self.dataset_folder = None
@@ -45,7 +46,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		self.onlyFloat = QDoubleValidator()
 		self.onlyInt = QIntValidator()
 
-		self.screen_height = self.parent.parent.parent.screen_height
+		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
 		center_window(self)
 
 		self.setMinimumWidth(500)
@@ -64,30 +65,30 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		# Create button widget and layout
 		self.scroll_area = QScrollArea(self)
 		self.button_widget = QWidget()
-		main_layout = QVBoxLayout()
-		self.button_widget.setLayout(main_layout)
-		main_layout.setContentsMargins(30,30,30,30)
+		self.main_layout = QVBoxLayout()
+		self.button_widget.setLayout(self.main_layout)
+		self.main_layout.setContentsMargins(30,30,30,30)
 
 		# first frame for FEATURES
 		self.model_frame = QFrame()
 		self.model_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_model_frame()
-		main_layout.addWidget(self.model_frame)
+		self.main_layout.addWidget(self.model_frame)
 
 		self.data_frame = QFrame()
 		self.data_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_data_frame()
-		main_layout.addWidget(self.data_frame)
+		self.main_layout.addWidget(self.data_frame)
 
 		self.hyper_frame = QFrame()
 		self.hyper_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_hyper_frame()
-		main_layout.addWidget(self.hyper_frame)
+		self.main_layout.addWidget(self.hyper_frame)
 
 		self.submit_btn = QPushButton('Train')
-		self.submit_btn.setStyleSheet(self.parent.parent.parent.button_style_sheet)
+		self.submit_btn.setStyleSheet(self.button_style_sheet)
 		self.submit_btn.clicked.connect(self.prep_model)
-		main_layout.addWidget(self.submit_btn)
+		self.main_layout.addWidget(self.submit_btn)
 		self.submit_btn.setEnabled(False)
 
 		#self.populate_left_panel()
@@ -215,7 +216,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		self.cancel_dataset = QPushButton()
 		self.cancel_dataset.setIcon(icon(MDI6.close,color="black"))
 		self.cancel_dataset.clicked.connect(self.clear_dataset)
-		self.cancel_dataset.setStyleSheet(self.parent.parent.parent.button_select_all)
+		self.cancel_dataset.setStyleSheet(self.button_select_all)
 		self.cancel_dataset.setIconSize(QSize(20, 20))
 		self.cancel_dataset.setVisible(False)
 		train_data_layout.addWidget(self.cancel_dataset, 5)
@@ -292,7 +293,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		self.cancel_pretrained = QPushButton()
 		self.cancel_pretrained.setIcon(icon(MDI6.close,color="black"))
 		self.cancel_pretrained.clicked.connect(self.clear_pretrained)
-		self.cancel_pretrained.setStyleSheet(self.parent.parent.parent.button_select_all)
+		self.cancel_pretrained.setStyleSheet(self.button_select_all)
 		self.cancel_pretrained.setIconSize(QSize(20, 20))
 		self.cancel_pretrained.setVisible(False)
 		pretrained_layout.addWidget(self.cancel_pretrained, 5)
@@ -318,13 +319,13 @@ class ConfigSegmentationModelTraining(QMainWindow):
 
 			self.normalization_mode_btns[i].setIcon(icon(MDI6.percent_circle,color="#1565c0"))
 			self.normalization_mode_btns[i].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[i].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[i].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[i].setToolTip("Switch to absolute normalization values.")
 			self.normalization_mode_btns[i].clicked.connect(partial(self.switch_normalization_mode, i))
 
 			self.normalization_clip_btns[i].setIcon(icon(MDI6.content_cut,color="black"))
 			self.normalization_clip_btns[i].setIconSize(QSize(20, 20))	
-			self.normalization_clip_btns[i].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[i].setStyleSheet(self.button_select_all)	
 			self.normalization_clip_btns[i].clicked.connect(partial(self.switch_clipping_mode, i))
 			self.normalization_clip_btns[i].setToolTip('clip')
 
@@ -337,7 +338,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		self.channel_items = ['--', 'brightfield_channel', 'live_nuclei_channel', 'dead_nuclei_channel', 
 							 'effector_fluo_channel', 'adhesion_channel', 'fluo_channel_1', 'fluo_channel_2','None'
 							]
-		exp_ch = self.parent.parent.exp_channels
+		exp_ch = self.parent_window.parent_window.exp_channels
 		for c in exp_ch:
 			if c not in self.channel_items:
 				self.channel_items.append(c)
@@ -452,9 +453,9 @@ class ConfigSegmentationModelTraining(QMainWindow):
 
 	def set_cellpose_scale(self):
 
-		scale = self.parent.parent.PxToUm * float(self.diameter_le.text()) / 30.0
+		scale = self.parent_window.parent_window.PxToUm * float(self.diameter_le.text()) / 30.0
 		if self.model_name=="CP_nuclei":
-			scale = self.parent.parent.PxToUm * float(self.diameter_le.text()) / 17.0
+			scale = self.parent_window.parent_window.PxToUm * float(self.diameter_le.text()) / 17.0
 		self.spatial_calib_le.setText(str(scale))
 		self.diamWidget.close()		
 
@@ -647,7 +648,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		with open(model_folder+"training_instructions.json", 'w') as f:
 			json.dump(training_instructions, f, indent=4)
 		
-		train_segmentation_model(model_folder+"training_instructions.json", use_gpu=self.parent.parent.parent.use_gpu)
+		train_segmentation_model(model_folder+"training_instructions.json", use_gpu=self.parent_window.parent_window.parent_window.use_gpu)
 
 		# self.parent.refresh_signal_models()
 
@@ -673,7 +674,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		if self.normalization_mode[index]:
 			self.normalization_mode_btns[index].setIcon(icon(MDI6.percent_circle,color="#1565c0"))
 			self.normalization_mode_btns[index].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[index].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[index].setToolTip("Switch to absolute normalization values.")
 			self.normalization_min_value_lbl[index].setText('Min %: ')
 			self.normalization_max_value_lbl[index].setText('Max %: ')
@@ -683,7 +684,7 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		else:
 			self.normalization_mode_btns[index].setIcon(icon(MDI6.percent_circle_outline,color="black"))
 			self.normalization_mode_btns[index].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[index].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[index].setToolTip("Switch to percentile normalization values.")
 			self.normalization_min_value_lbl[index].setText('Min: ')
 			self.normalization_min_value_le[index].setText('0')
@@ -698,9 +699,9 @@ class ConfigSegmentationModelTraining(QMainWindow):
 		if self.clip_option[index]:
 			self.normalization_clip_btns[index].setIcon(icon(MDI6.content_cut,color="#1565c0"))
 			self.normalization_clip_btns[index].setIconSize(QSize(20, 20))
-			self.normalization_clip_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[index].setStyleSheet(self.button_select_all)	
 
 		else:
 			self.normalization_clip_btns[index].setIcon(icon(MDI6.content_cut,color="black"))
 			self.normalization_clip_btns[index].setIconSize(QSize(20, 20))		
-			self.normalization_clip_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[index].setStyleSheet(self.button_select_all)	

celldetective/gui/retrain_signal_model_options.py

@@ -22,31 +22,32 @@ from pathlib import Path, PurePath
 from datetime import datetime
 import pandas as pd
 from functools import partial
+from celldetective.gui import Styles
 
-class ConfigSignalModelTraining(QMainWindow):
+class ConfigSignalModelTraining(QMainWindow, Styles):
 	
 	"""
 	UI to set measurement instructions.
 
 	"""
 
-	def __init__(self, parent=None):
+	def __init__(self, parent_window=None):
 		
 		super().__init__()
-		self.parent = parent
+		self.parent_window = parent_window
 		self.setWindowTitle("Train signal model")
 		self.setWindowIcon(QIcon(os.sep.join(['celldetective','icons','mexican-hat.png'])))
-		self.mode = self.parent.mode
-		self.exp_dir = self.parent.exp_dir
+		self.mode = self.parent_window.mode
+		self.exp_dir = self.parent_window.exp_dir
 		self.soft_path = get_software_location()
 		self.pretrained_model = None 
 		self.dataset_folder = None
-		self.signal_models_dir = self.soft_path+'/celldetective/models/signal_detection/'
+		self.signal_models_dir = self.soft_path+os.sep+os.sep.join(['celldetective','models','signal_detection'])
 
 		self.onlyFloat = QDoubleValidator()
 		self.onlyInt = QIntValidator()
 
-		self.screen_height = self.parent.parent.parent.screen_height
+		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
 		center_window(self)
 
 		self.setMinimumWidth(500)
@@ -65,30 +66,30 @@ class ConfigSignalModelTraining(QMainWindow):
 		# Create button widget and layout
 		self.scroll_area = QScrollArea(self)
 		self.button_widget = QWidget()
-		main_layout = QVBoxLayout()
-		self.button_widget.setLayout(main_layout)
-		main_layout.setContentsMargins(30,30,30,30)
+		self.main_layout = QVBoxLayout()
+		self.button_widget.setLayout(self.main_layout)
+		self.main_layout.setContentsMargins(30,30,30,30)
 
 		# first frame for FEATURES
 		self.model_frame = QFrame()
 		self.model_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_model_frame()
-		main_layout.addWidget(self.model_frame)
+		self.main_layout.addWidget(self.model_frame)
 
 		self.data_frame = QFrame()
 		self.data_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_data_frame()
-		main_layout.addWidget(self.data_frame)
+		self.main_layout.addWidget(self.data_frame)
 
 		self.hyper_frame = QFrame()
 		self.hyper_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_hyper_frame()
-		main_layout.addWidget(self.hyper_frame)
+		self.main_layout.addWidget(self.hyper_frame)
 
 		self.submit_btn = QPushButton('Train')
-		self.submit_btn.setStyleSheet(self.parent.parent.parent.button_style_sheet)
+		self.submit_btn.setStyleSheet(self.button_style_sheet)
 		self.submit_btn.clicked.connect(self.prep_model)
-		main_layout.addWidget(self.submit_btn)
+		self.main_layout.addWidget(self.submit_btn)
 		self.submit_btn.setEnabled(False)
 
 		#self.populate_left_panel()
@@ -214,7 +215,7 @@ class ConfigSignalModelTraining(QMainWindow):
 		self.cancel_dataset = QPushButton()
 		self.cancel_dataset.setIcon(icon(MDI6.close,color="black"))
 		self.cancel_dataset.clicked.connect(self.clear_dataset)
-		self.cancel_dataset.setStyleSheet(self.parent.parent.parent.button_select_all)
+		self.cancel_dataset.setStyleSheet(self.button_select_all)
 		self.cancel_dataset.setIconSize(QSize(20, 20))
 		self.cancel_dataset.setVisible(False)
 		train_data_layout.addWidget(self.cancel_dataset, 5)
@@ -291,7 +292,7 @@ class ConfigSignalModelTraining(QMainWindow):
 		self.cancel_pretrained = QPushButton()
 		self.cancel_pretrained.setIcon(icon(MDI6.close,color="black"))
 		self.cancel_pretrained.clicked.connect(self.clear_pretrained)
-		self.cancel_pretrained.setStyleSheet(self.parent.parent.parent.button_select_all)
+		self.cancel_pretrained.setStyleSheet(self.button_select_all)
 		self.cancel_pretrained.setIconSize(QSize(20, 20))
 		self.cancel_pretrained.setVisible(False)
 		pretrained_layout.addWidget(self.cancel_pretrained, 5)
@@ -319,13 +320,13 @@ class ConfigSignalModelTraining(QMainWindow):
 
 			self.normalization_mode_btns[i].setIcon(icon(MDI6.percent_circle,color="#1565c0"))
 			self.normalization_mode_btns[i].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[i].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[i].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[i].setToolTip("Switch to absolute normalization values.")
 			self.normalization_mode_btns[i].clicked.connect(partial(self.switch_normalization_mode, i))
 
 			self.normalization_clip_btns[i].setIcon(icon(MDI6.content_cut,color="black"))
 			self.normalization_clip_btns[i].setIconSize(QSize(20, 20))	
-			self.normalization_clip_btns[i].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[i].setStyleSheet(self.button_select_all)	
 			self.normalization_clip_btns[i].clicked.connect(partial(self.switch_clipping_mode, i))
 			self.normalization_clip_btns[i].setToolTip('clip')
 
@@ -585,7 +586,7 @@ class ConfigSignalModelTraining(QMainWindow):
 		
 		train_signal_model(model_folder+"training_instructions.json")
 
-		self.parent.refresh_signal_models()
+		self.parent_window.refresh_signal_models()
 
 
 	def check_valid_channels(self):
@@ -609,7 +610,7 @@ class ConfigSignalModelTraining(QMainWindow):
 		if self.normalization_mode[index]:
 			self.normalization_mode_btns[index].setIcon(icon(MDI6.percent_circle,color="#1565c0"))
 			self.normalization_mode_btns[index].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[index].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[index].setToolTip("Switch to absolute normalization values.")
 			self.normalization_min_value_lbl[index].setText('Min %: ')
 			self.normalization_max_value_lbl[index].setText('Max %: ')
@@ -619,7 +620,7 @@ class ConfigSignalModelTraining(QMainWindow):
 		else:
 			self.normalization_mode_btns[index].setIcon(icon(MDI6.percent_circle_outline,color="black"))
 			self.normalization_mode_btns[index].setIconSize(QSize(20, 20))	
-			self.normalization_mode_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_mode_btns[index].setStyleSheet(self.button_select_all)	
 			self.normalization_mode_btns[index].setToolTip("Switch to percentile normalization values.")
 			self.normalization_min_value_lbl[index].setText('Min: ')
 			self.normalization_min_value_le[index].setText('0')
@@ -634,10 +635,10 @@ class ConfigSignalModelTraining(QMainWindow):
 		if self.clip_option[index]:
 			self.normalization_clip_btns[index].setIcon(icon(MDI6.content_cut,color="#1565c0"))
 			self.normalization_clip_btns[index].setIconSize(QSize(20, 20))
-			self.normalization_clip_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[index].setStyleSheet(self.button_select_all)	
 
 		else:
 			self.normalization_clip_btns[index].setIcon(icon(MDI6.content_cut,color="black"))
 			self.normalization_clip_btns[index].setIconSize(QSize(20, 20))		
-			self.normalization_clip_btns[index].setStyleSheet(self.parent.parent.parent.button_select_all)	
+			self.normalization_clip_btns[index].setStyleSheet(self.button_select_all)	
 

celldetective/gui/seg_model_loader.py

@@ -10,18 +10,19 @@ from glob import glob
 import os
 import json
 import shutil
+from celldetective.gui import Styles
 
-class SegmentationModelLoader(QWidget):
+class SegmentationModelLoader(QWidget, Styles):
 	
 	"""
 	Upload a segmentation model or define a Threshold pipeline.
 	"""
 
-	def __init__(self, parent):
+	def __init__(self, parent_window):
 		
 		super().__init__()
-		self.parent = parent
-		self.mode = self.parent.mode
+		self.parent_window = parent_window
+		self.mode = self.parent_window.mode
 		if self.mode=="targets":
 			self.target_folder = "segmentation_targets"
 		elif self.mode=="effectors":
@@ -29,6 +30,7 @@ class SegmentationModelLoader(QWidget):
 		self.setWindowTitle('Upload model')
 		self.generate_content()
 		center_window(self)
+		self.setAttribute(Qt.WA_DeleteOnClose)
 
 	def generate_content(self):
 
@@ -83,7 +85,7 @@ class SegmentationModelLoader(QWidget):
 		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.parent.parent.parent.button_style_sheet)
+		self.upload_button.setStyleSheet(self.button_style_sheet)
 		self.upload_button.setEnabled(False)
 		self.layout.addWidget(self.upload_button, 10, 0, 1, 1)
 		
@@ -121,31 +123,37 @@ class SegmentationModelLoader(QWidget):
 		
 		self.base_block = QGridLayout()
 		
+		pixel_calib_layout = QHBoxLayout()
 		self.calibration_label = QLabel("pixel calibration: ")
-		self.base_block.addWidget(self.calibration_label,0,0,1,1, alignment=Qt.AlignLeft)
 		self.spatial_calib_le = QLineEdit("0,1")
-		self.qdv = QDoubleValidator(0.0, np.amax([self.parent.parent.shape_x, self.parent.parent.shape_y]), 8, notation=QDoubleValidator.StandardNotation)
+		self.qdv = QDoubleValidator(0.0, np.amax([self.parent_window.parent_window.shape_x, self.parent_window.parent_window.shape_y]), 8, notation=QDoubleValidator.StandardNotation)
 		self.spatial_calib_le.setValidator(self.qdv)
-		self.base_block.addWidget(self.spatial_calib_le, 0,1,1,2,alignment=Qt.AlignRight)
+		pixel_calib_layout.addWidget(self.calibration_label, 30)
+		pixel_calib_layout.addWidget(self.spatial_calib_le, 70)
+		self.base_block.addLayout(pixel_calib_layout, 0,0,1,3)
 
 		self.channel_options = ["--","live_nuclei_channel", "dead_nuclei_channel", "effector_fluo_channel", "brightfield_channel", "adhesion_channel", "fluo_channel_1", "fluo_channel_2"]
-		exp_channels = self.parent.parent.exp_channels
+		exp_channels = self.parent_window.parent_window.exp_channels
 		for ec in exp_channels:
 			if ec not in self.channel_options:
 				self.channel_options.append(ec)
 		self.channel_options += ['None']
 
+		channel_1_layout = QHBoxLayout()
 		self.ch_1_label = QLabel("channel 1: ")
-		self.base_block.addWidget(self.ch_1_label, 1, 0, 1, 1, alignment=Qt.AlignLeft)
 		self.combo_ch1 = QComboBox()
 		self.combo_ch1.addItems(self.channel_options)
-		self.base_block.addWidget(self.combo_ch1, 1, 1, 1, 2, alignment=Qt.AlignRight)
+		channel_1_layout.addWidget(self.ch_1_label,30)
+		channel_1_layout.addWidget(self.combo_ch1, 70)
+		self.base_block.addLayout(channel_1_layout, 1, 0, 1, 3, alignment=Qt.AlignRight)
 
+		channel_2_layout = QHBoxLayout()
 		self.ch_2_label = QLabel("channel 2: ")
-		self.base_block.addWidget(self.ch_2_label, 2, 0, 1, 1, alignment=Qt.AlignLeft)
 		self.combo_ch2 = QComboBox()
 		self.combo_ch2.addItems(self.channel_options)
-		self.base_block.addWidget(self.combo_ch2, 2, 1, 1, 2, alignment=Qt.AlignRight)
+		channel_2_layout.addWidget(self.ch_2_label, 30)
+		channel_2_layout.addWidget(self.combo_ch2, 70)
+		self.base_block.addLayout(channel_2_layout, 2, 0, 1, 3, alignment=Qt.AlignRight)
 
 	def generate_stardist_specific_block(self):
 
@@ -209,7 +217,7 @@ class SegmentationModelLoader(QWidget):
 		self.threshold_config_button.setIcon(icon(MDI6.auto_fix,color="#1565c0"))
 		self.threshold_config_button.setIconSize(QSize(20, 20))
 		self.threshold_config_button.setVisible(False)
-		self.threshold_config_button.setStyleSheet(self.parent.parent.parent.button_style_sheet_2)
+		self.threshold_config_button.setStyleSheet(self.button_style_sheet_2)
 		self.threshold_config_button.clicked.connect(self.open_threshold_config_wizard)
 		self.layout.addWidget(self.threshold_config_button,3,0,1,2)
 		self.threshold_config_button.hide()
@@ -341,15 +349,17 @@ class SegmentationModelLoader(QWidget):
 						return None
 
 			self.generate_input_config()
-			self.parent.init_seg_model_list()
+			self.parent_window.init_seg_model_list()
 			self.close()
 		else:
 			if self.mode=="targets":	
-				self.parent.threshold_config_targets = self.filename
+				self.parent_window.threshold_config_targets = self.filename
+				self.parent_window.seg_model_list.setCurrentText('Threshold')
 				print('Path to threshold configuration successfully set in the software')
 				self.close()
 			elif self.mode=="effectors":
-				self.parent.threshold_config_effectors = self.filename
+				self.parent_window.threshold_config_effectors = self.filename
+				self.parent_window.seg_model_list.setCurrentText('Threshold')
 				print('Path to threshold configuration successfully set in the software')
 				self.close()	
 
@@ -446,15 +456,9 @@ class SegmentationModelLoader(QWidget):
 
 	def open_threshold_config_wizard(self):
 
-		if isinstance(self.parent.parent.pos, str):
+		self.parent_window.parent_window.locate_image()
+		if self.parent_window.parent_window.current_stack is None:
+			return None
+		else:
 			self.ThreshWizard = ThresholdConfigWizard(self)
 			self.ThreshWizard.show()
-		else:
-			msgBox = QMessageBox()
-			msgBox.setIcon(QMessageBox.Warning)
-			msgBox.setText("Please select a unique position before launching the wizard...")
-			msgBox.setWindowTitle("Warning")
-			msgBox.setStandardButtons(QMessageBox.Ok)
-			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Ok:
-				return None