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

celldetective/gui/{measurement_options.py → settings/_settings_measurements.py}

@@ -1,11 +1,10 @@
 from subprocess import Popen
 
-from PyQt5.QtWidgets import QApplication, QMessageBox, QScrollArea, QComboBox, QFrame, QCheckBox, \
+from PyQt5.QtWidgets import QMessageBox, QComboBox, QFrame, QCheckBox, \
 	QGridLayout, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QDoubleValidator, QIntValidator
 
-from celldetective.gui.gui_utils import center_window, FeatureChoice, ListWidget, QHSeperationLine, FigureCanvas, \
+from celldetective.gui.gui_utils import FeatureChoice, ListWidget, QHSeperationLine, FigureCanvas, \
 	GeometryChoice, OperationChoice
 from superqt import QLabeledDoubleSlider
 from superqt.fonticon import icon
@@ -27,10 +26,10 @@ from pathlib import Path
 from celldetective.gui.viewers import CellEdgeVisualizer, SpotDetectionVisualizer
 from celldetective.gui.layouts import ProtocolDesignerLayout, BackgroundFitCorrectionLayout, LocalCorrectionLayout
 from celldetective.gui.gui_utils import PreprocessingLayout2
-from celldetective.gui import CelldetectiveMainWindow, CelldetectiveWidget
+from celldetective.gui.settings._settings_base import CelldetectiveSettingsPanel
 
 
-class ConfigMeasurements(CelldetectiveMainWindow):
+class SettingsMeasurements(CelldetectiveSettingsPanel):
 	"""
 	UI to set measurement instructions.
 
@@ -38,49 +37,33 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 
 	def __init__(self, parent_window=None):
 
-		super().__init__()
-
 		self.parent_window = parent_window
-		self.setWindowTitle("Configure measurements")
 		self.mode = self.parent_window.mode
 		self.exp_dir = self.parent_window.exp_dir
 		self.background_correction = []
 		self.config_name = f"btrack_config_{self.mode}.json"
 		self.measure_instructions_path = self.parent_window.exp_dir + f"configs/measurement_instructions_{self.mode}.json"
-		self.soft_path = get_software_location()
 		self.clear_previous = False
-
-		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)
+		
+		super().__init__("Configure measurements")
 
-		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
-		center_window(self)
-
-		self.onlyFloat = QDoubleValidator()
-		self.onlyInt = QIntValidator()
-
-		self.setMinimumWidth(500)
-		self.setMinimumHeight(int(0.3 * self.screen_height))
-		self.setMaximumHeight(int(0.8 * self.screen_height))
-		self.populate_widget()
-		self.load_previous_measurement_instructions()
-
-	def populate_widget(self):
+		self._add_to_layout()
+		self._load_previous_instructions()
+		
+		self._adjustSize()
+		self.resize(int(self.width()), int(self._screen_height * 0.8))
+	
+	def _create_widgets(self):
 
 		"""
 		Create the multibox design.
 
 		"""
-
-		# 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)
+		super()._create_widgets()
 
 		self.normalisation_frame = QFrame()
 		self.normalisation_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
@@ -98,48 +81,31 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		self.normalisation_frame.setLayout(self.protocol_layout)
 
 		#self.populate_normalisation_tabs()
-		main_layout.addWidget(self.normalisation_frame)
 
 		# first frame for FEATURES
 		self.features_frame = QFrame()
 		self.features_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_features_frame()
-		main_layout.addWidget(self.features_frame)
 
 		# second frame for ISOTROPIC MEASUREMENTS
 		self.iso_frame = QFrame()
 		self.iso_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_iso_frame()
-		main_layout.addWidget(self.iso_frame)
 
 		self.spot_detection_frame = QFrame()
 		self.spot_detection_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_spot_detection()
-		main_layout.addWidget(self.spot_detection_frame)
 
 		self.clear_previous_btn = QCheckBox('clear previous measurements')
-		main_layout.addWidget(self.clear_previous_btn)
-
-		self.submit_btn = QPushButton('Save')
-		self.submit_btn.setStyleSheet(self.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()
-
-		QApplication.processEvents()
-		self.adjustScrollArea()
 
+	def _add_to_layout(self):
+		self._layout.addWidget(self.normalisation_frame)
+		self._layout.addWidget(self.features_frame)
+		self._layout.addWidget(self.iso_frame)
+		self._layout.addWidget(self.spot_detection_frame)
+		self._layout.addWidget(self.clear_previous_btn)
+		self._layout.addWidget(self.submit_btn)
+	
 	def populate_iso_frame(self):
 
 		"""
@@ -431,7 +397,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 
 	def go_to_extraprops(self):
 		
-		path = os.sep.join([self.soft_path,'celldetective',os.sep,'extra_properties.py'])
+		path = os.sep.join([self._software_path,'celldetective',os.sep,'extra_properties.py'])
 		try:
 			Popen(f'explorer {os.path.realpath(path)}')
 		except:
@@ -487,7 +453,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		while self.scroll_area.verticalScrollBar().isVisible() and self.height() < self.maximumHeight():
 			self.resize(self.width(), self.height() + step)
 
-	def write_instructions(self):
+	def _write_instructions(self):
 
 		"""
 		Write the selected options in a json file for later reading by the software.
@@ -566,7 +532,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		else:
 			self.haralick_options = None
 
-	def load_previous_measurement_instructions(self):
+	def _load_previous_instructions(self):
 
 		"""
 		Read the measurmeent options from a previously written json file and format properly for the UI.
@@ -685,18 +651,6 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 					else:
 						self.operations_list.list_widget.clear()
 
-				# if 'radial_intensity' in measurement_instructions:
-				#     radial_intensity = measurement_instructions['radial_intensity']
-				#     if radial_intensity is not None:
-				#         self.radial_intensity_btn.setChecked(True)
-				#         self.step_size.setText(str(radial_intensity['radial_step']))
-				#         self.step_size.setEnabled(True)
-				#         self.step_lbl.setEnabled(True)
-				#         for checkbox in self.channel_chechkboxes:
-				#             checkbox.setEnabled(True)
-				#             if checkbox.text() in radial_intensity['radial_channels']:
-				#                 checkbox.setChecked(True)
-
 				if 'clear_previous' in measurement_instructions:
 					self.clear_previous = measurement_instructions['clear_previous']
 					self.clear_previous_btn.setChecked(self.clear_previous)
@@ -718,6 +672,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 			returnValue = msgBox.exec()
 			if returnValue == QMessageBox.Ok:
 				self.current_stack = None
+				self.test_frame = None
 				return None
 		else:
 			self.current_stack = movies[0]
@@ -946,7 +901,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		diam_hbox = QHBoxLayout()
 		self.diameter_lbl = QLabel('Spot diameter: ')
 		self.diameter_value = QLineEdit()
-		self.diameter_value.setValidator(self.onlyFloat)
+		self.diameter_value.setValidator(self._floatValidator)
 		self.diameter_value.setText('7')
 		self.diameter_value.textChanged.connect(self.enable_spot_preview)
 
@@ -957,7 +912,7 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		thresh_hbox = QHBoxLayout()
 		self.threshold_lbl = QLabel('Spot threshold: ')
 		self.threshold_value = QLineEdit()
-		self.threshold_value.setValidator(self.onlyFloat)
+		self.threshold_value.setValidator(self._floatValidator)
 		self.threshold_value.setText('0')
 		self.threshold_value.textChanged.connect(self.enable_spot_preview)
 
@@ -965,14 +920,6 @@ class ConfigMeasurements(CelldetectiveMainWindow):
 		thresh_hbox.addWidget(self.threshold_value, 70)
 		layout.addLayout(thresh_hbox)
 
-		# #invert_layout = QHBoxLayout()
-		# self.invert_check = QCheckBox('invert')
-		# self.invert_value_le = QLineEdit('65535')
-		# self.invert_value_le.setValidator(self.onlyFloat)
-		# layout.addWidget(self.invert_check, 6, 0)
-		# layout.addWidget(self.invert_value_le, 6, 1)
-		# #layout.addLayout(invert_layout, 5, 1, 1, 1)
-
 		self.spot_detection_widgets = [self.spot_channel, 
 									   self.spot_channel_lbl,
 									   self.diameter_value,

celldetective/gui/{neighborhood_options.py → settings/_settings_neighborhood.py}

@@ -12,7 +12,7 @@ from celldetective.gui.viewers import CellSizeViewer, CellEdgeVisualizer
 from celldetective.gui import CelldetectiveWidget
 
 
-class ConfigNeighborhoods(CelldetectiveWidget):
+class SettingsNeighborhood(CelldetectiveWidget):
 	
 	"""
 	Widget to configure neighborhood measurements.

celldetective/gui/settings/_settings_segmentation.py

@@ -0,0 +1,49 @@
+from PyQt5.QtWidgets import QCheckBox
+from PyQt5.QtCore import QSize
+from superqt.fonticon import icon
+from fonticon_mdi6 import MDI6
+from celldetective.gui.settings._settings_base import CelldetectiveSettingsPanel
+import json
+import os
+
+class SettingsSegmentation(CelldetectiveSettingsPanel):
+	
+	def __init__(self, parent_window=None):
+		
+		super().__init__(title="Configure segmentation")
+		self.parent_window = parent_window
+		self.mode = self.parent_window.mode
+		self.exp_dir = self.parent_window.exp_dir
+		self._instructions_path = self.parent_window.exp_dir + f"configs/segmentation_instructions_{self.mode}.json"
+		self._add_to_layout()
+		self._load_previous_instructions()
+		
+	def _create_widgets(self):
+		super()._create_widgets()
+		
+		self.flip_segmentation_checkbox: QCheckBox = QCheckBox("Segment frames in reverse order")
+		self.flip_segmentation_checkbox.setIcon(icon(MDI6.camera_flip_outline,color="black"))
+		self.flip_segmentation_checkbox.setIconSize(QSize(20, 20))
+		self.flip_segmentation_checkbox.setStyleSheet(self.button_select_all)
+		self.flip_segmentation_checkbox.setToolTip("Flip the order of the frames for segmentation.")
+	
+	def _add_to_layout(self):
+		self._layout.addWidget(self.flip_segmentation_checkbox)
+		self._layout.addWidget(self.submit_btn)
+		#self._widget.adjustSize()
+
+	def _load_previous_instructions(self):
+		if os.path.exists(self._instructions_path):
+			with open(self._instructions_path, "r") as f:
+				instructions = json.load(f)
+			if isinstance(instructions.get("flip"),bool):
+				self.flip_segmentation_checkbox.setChecked(instructions.get("flip"))
+	
+	def _write_instructions(self):
+		instructions = {"flip": self.flip_segmentation_checkbox.isChecked()}
+		print('Segmentation instructions: ', instructions)
+		file_name = self._instructions_path
+		with open(file_name, 'w') as f:
+			json.dump(instructions, f, indent=4)
+		print('Done.')
+		self.close()

celldetective/gui/{retrain_segmentation_model_options.py → settings/_settings_segmentation_model_training.py}

@@ -1,13 +1,11 @@
-from PyQt5.QtWidgets import QApplication,QRadioButton, QScrollArea, QComboBox, QFrame, QFileDialog, QGridLayout, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
+from PyQt5.QtWidgets import QRadioButton, QComboBox, QFrame, QFileDialog, QGridLayout, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QDoubleValidator, QIntValidator
-from celldetective.gui.gui_utils import center_window, generic_message
+from celldetective.gui.gui_utils import generic_message
 from celldetective.gui.layouts import ChannelNormGenerator
 
 from superqt import QLabeledDoubleSlider,QLabeledSlider
 from superqt.fonticon import icon
 from fonticon_mdi6 import MDI6
-from celldetective.utils import get_software_location
 from celldetective.io import get_segmentation_datasets_list, locate_segmentation_dataset, get_segmentation_models_list
 from celldetective.segmentation import train_segmentation_model
 from celldetective.gui.layouts import CellposeParamsWidget
@@ -16,10 +14,9 @@ import json
 import os
 from glob import glob
 from datetime import datetime
-from celldetective.gui import CelldetectiveMainWindow, CelldetectiveWidget
+from celldetective.gui.settings._settings_base import CelldetectiveSettingsPanel
 
-
-class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
+class SettingsSegmentationModelTraining(CelldetectiveSettingsPanel):
 	
 	"""
 	UI to set segmentation model training instructions.
@@ -28,85 +25,56 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 
 	def __init__(self, parent_window=None):
 		
-		super().__init__()
 		self.parent_window = parent_window
 		self.use_gpu = self.parent_window.use_gpu
-		self.setWindowTitle("Train segmentation model")
 		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.pretrained_model = None
 		self.dataset_folder = None
-		self.software_models_dir = os.sep.join([self.soft_path, 'celldetective', 'models', f'segmentation_{self.mode}'])
-
-		self.onlyFloat = QDoubleValidator()
-		self.onlyInt = QIntValidator()
-
-		self.screen_height = self.parent_window.parent_window.parent_window.screen_height
-		center_window(self)
-
-		self.setMinimumWidth(500)
-		self.setMinimumHeight(int(0.3*self.screen_height))
-		self.setMaximumHeight(int(0.8*self.screen_height))
-		self.populate_widget()
-		#self.load_previous_measurement_instructions()
+		super().__init__(title="Train segmentation model")
 
-	def populate_widget(self):
+		self.software_models_dir = os.sep.join([self._software_path, 'celldetective', 'models', f'segmentation_{self.mode}'])
+		self._add_to_layout()
+		self._load_previous_instructions()
+		
+		self._adjustSize()
+		self.resize(int(self.width()), int(self._screen_height * 0.8))
+	
+	def _add_to_layout(self):
+		
+		self._layout.addWidget(self.model_frame)
+		self._layout.addWidget(self.data_frame)
+		self._layout.addWidget(self.hyper_frame)
+		self._layout.addWidget(self.submit_warning)
+		self._layout.addWidget(self.submit_btn)
+	
+	def _create_widgets(self):
 
 		"""
 		Create the multibox design.
 
 		"""
 		
-		# Create button widget and layout
-		self.scroll_area = QScrollArea(self)
-		self.button_widget = CelldetectiveWidget()
-		self.main_layout = QVBoxLayout()
-		self.button_widget.setLayout(self.main_layout)
-		self.main_layout.setContentsMargins(30,30,30,30)
-
-		# first frame for FEATURES
+		super()._create_widgets()
 		self.model_frame = QFrame()
 		self.model_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_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()
-		self.main_layout.addWidget(self.data_frame)
 
 		self.hyper_frame = QFrame()
 		self.hyper_frame.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
 		self.populate_hyper_frame()
-		self.main_layout.addWidget(self.hyper_frame)
 
-		self.submit_btn = QPushButton('Train')
-		self.submit_btn.setStyleSheet(self.button_style_sheet)
-		self.submit_btn.clicked.connect(self.prep_model)
-		self.main_layout.addWidget(self.submit_btn)
 		self.submit_btn.setEnabled(False)
 		self.submit_warning = QLabel('')
-		self.main_layout.addWidget(self.submit_warning)
+		self.submit_btn.setText("Train")
 
 		self.spatial_calib_le.textChanged.connect(self.activate_train_btn)
 		self.modelname_le.setText(f"Untitled_model_{datetime.today().strftime('%Y-%m-%d')}")
 
-		#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()
-
-		QApplication.processEvents()
-		self.adjustScrollArea()
-
 	def populate_hyper_frame(self):
 
 		"""
@@ -135,14 +103,14 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 		lr_layout = QHBoxLayout()
 		lr_layout.addWidget(QLabel('learning rate: '),30)
 		self.lr_le = QLineEdit('0,0003')
-		self.lr_le.setValidator(self.onlyFloat)
+		self.lr_le.setValidator(self._floatValidator)
 		lr_layout.addWidget(self.lr_le, 70)
 		layout.addLayout(lr_layout)
 
 		bs_layout = QHBoxLayout()
 		bs_layout.addWidget(QLabel('batch size: '),30)
 		self.bs_le = QLineEdit('8')
-		self.bs_le.setValidator(self.onlyInt)
+		self.bs_le.setValidator(self._intValidator)
 		bs_layout.addWidget(self.bs_le, 70)
 		layout.addLayout(bs_layout)
 
@@ -318,7 +286,7 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 		parent_pxtoum = f"{self.parent_window.parent_window.PxToUm}"
 		self.spatial_calib_le = QLineEdit(parent_pxtoum.replace('.',','))
 		self.spatial_calib_le.setPlaceholderText('e.g. 0.1 µm per pixel')
-		self.spatial_calib_le.setValidator(self.onlyFloat)
+		self.spatial_calib_le.setValidator(self._floatValidator)
 		spatial_calib_layout.addWidget(self.spatial_calib_le, 70)
 		layout.addLayout(spatial_calib_layout)
 
@@ -349,17 +317,11 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 
 	def showDialog_pretrained(self):
 
-		# try:
-		# 	self.cancel_pretrained.click()
-		# except Exception as e:
-		# 	print(e)
-		# 	pass
-
 		self.clear_pretrained()
 		self.pretrained_model = None
 		self.pretrained_model = QFileDialog.getExistingDirectory(
 						self, "Open Directory",
-						os.sep.join([self.soft_path, 'celldetective', 'models', f'segmentation_generic','']),
+						os.sep.join([self._software_path, 'celldetective', 'models', f'segmentation_generic','']),
 						QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks,
 						)
 		
@@ -531,18 +493,7 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 
 		self.spatial_calib_le.setText(str(spatial_calib).replace('.',','))
 
-	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 prep_model(self):
+	def _write_instructions(self):
 
 		model_name = self.modelname_le.text()
 		pretrained_model = self.pretrained_model
@@ -623,4 +574,7 @@ class ConfigSegmentationModelTraining(CelldetectiveMainWindow):
 
 		self.parent_window.init_seg_model_list()
 		idx = self.parent_window.seg_model_list.findText(model_name)
-		self.parent_window.seg_model_list.setCurrentIndex(idx)
+		self.parent_window.seg_model_list.setCurrentIndex(idx)
+	
+	def _load_previous_instructions(self):
+		pass