celldetective 1.3.9.post5__py3-none-any.whl → 1.4.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (94) hide show
  1. celldetective/__init__.py +0 -3
  2. celldetective/_version.py +1 -1
  3. celldetective/events.py +2 -4
  4. celldetective/exceptions.py +11 -0
  5. celldetective/extra_properties.py +132 -0
  6. celldetective/filters.py +7 -1
  7. celldetective/gui/InitWindow.py +37 -46
  8. celldetective/gui/__init__.py +3 -9
  9. celldetective/gui/about.py +19 -15
  10. celldetective/gui/analyze_block.py +34 -19
  11. celldetective/gui/base_annotator.py +786 -0
  12. celldetective/gui/base_components.py +23 -0
  13. celldetective/gui/classifier_widget.py +86 -94
  14. celldetective/gui/configure_new_exp.py +163 -46
  15. celldetective/gui/control_panel.py +76 -146
  16. celldetective/gui/{signal_annotator.py → event_annotator.py} +533 -1438
  17. celldetective/gui/generic_signal_plot.py +11 -13
  18. celldetective/gui/gui_utils.py +54 -23
  19. celldetective/gui/help/neighborhood.json +2 -2
  20. celldetective/gui/json_readers.py +5 -4
  21. celldetective/gui/layouts.py +265 -31
  22. celldetective/gui/{signal_annotator2.py → pair_event_annotator.py} +433 -635
  23. celldetective/gui/plot_measurements.py +21 -17
  24. celldetective/gui/plot_signals_ui.py +125 -72
  25. celldetective/gui/process_block.py +283 -188
  26. celldetective/gui/processes/compute_neighborhood.py +594 -0
  27. celldetective/gui/processes/downloader.py +37 -34
  28. celldetective/gui/processes/measure_cells.py +19 -8
  29. celldetective/gui/processes/segment_cells.py +47 -11
  30. celldetective/gui/processes/track_cells.py +18 -13
  31. celldetective/gui/seg_model_loader.py +21 -62
  32. celldetective/gui/settings/__init__.py +7 -0
  33. celldetective/gui/settings/_settings_base.py +70 -0
  34. celldetective/gui/{retrain_signal_model_options.py → settings/_settings_event_model_training.py} +54 -109
  35. celldetective/gui/{measurement_options.py → settings/_settings_measurements.py} +54 -92
  36. celldetective/gui/{neighborhood_options.py → settings/_settings_neighborhood.py} +10 -13
  37. celldetective/gui/settings/_settings_segmentation.py +49 -0
  38. celldetective/gui/{retrain_segmentation_model_options.py → settings/_settings_segmentation_model_training.py} +38 -92
  39. celldetective/gui/{signal_annotator_options.py → settings/_settings_signal_annotator.py} +78 -103
  40. celldetective/gui/{btrack_options.py → settings/_settings_tracking.py} +85 -116
  41. celldetective/gui/styles.py +2 -1
  42. celldetective/gui/survival_ui.py +49 -95
  43. celldetective/gui/tableUI.py +53 -25
  44. celldetective/gui/table_ops/__init__.py +0 -0
  45. celldetective/gui/table_ops/merge_groups.py +118 -0
  46. celldetective/gui/thresholds_gui.py +617 -1221
  47. celldetective/gui/viewers.py +107 -42
  48. celldetective/gui/workers.py +8 -4
  49. celldetective/io.py +137 -57
  50. celldetective/links/zenodo.json +145 -144
  51. celldetective/measure.py +94 -53
  52. celldetective/neighborhood.py +342 -268
  53. celldetective/preprocessing.py +56 -35
  54. celldetective/regionprops/_regionprops.py +16 -5
  55. celldetective/relative_measurements.py +50 -29
  56. celldetective/scripts/analyze_signals.py +4 -1
  57. celldetective/scripts/measure_cells.py +5 -5
  58. celldetective/scripts/measure_relative.py +20 -12
  59. celldetective/scripts/segment_cells.py +4 -10
  60. celldetective/scripts/segment_cells_thresholds.py +3 -3
  61. celldetective/scripts/track_cells.py +10 -8
  62. celldetective/scripts/train_segmentation_model.py +18 -6
  63. celldetective/signals.py +29 -14
  64. celldetective/tracking.py +14 -3
  65. celldetective/utils.py +91 -62
  66. {celldetective-1.3.9.post5.dist-info → celldetective-1.4.1.dist-info}/METADATA +24 -16
  67. celldetective-1.4.1.dist-info/RECORD +123 -0
  68. {celldetective-1.3.9.post5.dist-info → celldetective-1.4.1.dist-info}/WHEEL +1 -1
  69. tests/gui/__init__.py +0 -0
  70. tests/gui/test_new_project.py +228 -0
  71. tests/gui/test_project.py +99 -0
  72. tests/test_preprocessing.py +2 -2
  73. celldetective/models/segmentation_effectors/ricm_bf_all_last/config_input.json +0 -79
  74. celldetective/models/segmentation_effectors/ricm_bf_all_last/ricm_bf_all_last +0 -0
  75. celldetective/models/segmentation_effectors/ricm_bf_all_last/training_instructions.json +0 -37
  76. celldetective/models/segmentation_effectors/test-transfer/config_input.json +0 -39
  77. celldetective/models/segmentation_effectors/test-transfer/test-transfer +0 -0
  78. celldetective/models/signal_detection/NucCond/classification_loss.png +0 -0
  79. celldetective/models/signal_detection/NucCond/classifier.h5 +0 -0
  80. celldetective/models/signal_detection/NucCond/config_input.json +0 -1
  81. celldetective/models/signal_detection/NucCond/log_classifier.csv +0 -126
  82. celldetective/models/signal_detection/NucCond/log_regressor.csv +0 -282
  83. celldetective/models/signal_detection/NucCond/regression_loss.png +0 -0
  84. celldetective/models/signal_detection/NucCond/regressor.h5 +0 -0
  85. celldetective/models/signal_detection/NucCond/scores.npy +0 -0
  86. celldetective/models/signal_detection/NucCond/test_confusion_matrix.png +0 -0
  87. celldetective/models/signal_detection/NucCond/test_regression.png +0 -0
  88. celldetective/models/signal_detection/NucCond/validation_confusion_matrix.png +0 -0
  89. celldetective/models/signal_detection/NucCond/validation_regression.png +0 -0
  90. celldetective-1.3.9.post5.dist-info/RECORD +0 -129
  91. tests/test_qt.py +0 -103
  92. {celldetective-1.3.9.post5.dist-info → celldetective-1.4.1.dist-info}/entry_points.txt +0 -0
  93. {celldetective-1.3.9.post5.dist-info → celldetective-1.4.1.dist-info/licenses}/LICENSE +0 -0
  94. {celldetective-1.3.9.post5.dist-info → celldetective-1.4.1.dist-info}/top_level.txt +0 -0
celldetective/__init__.py CHANGED
@@ -1,4 +1 @@
1
1
  from ._version import __version__
2
- #from .tracking import track, clean_trajectories
3
- #from .measure import contour_of_instance_segmentation
4
-
celldetective/_version.py CHANGED
@@ -1 +1 @@
1
- __version__ = "1.3.9.post5"
1
+ __version__ = "1.4.1"
celldetective/events.py CHANGED
@@ -52,7 +52,7 @@ def switch_to_events(classes, event_times, max_times, origin_times=None, left_ce
52
52
  >>> event_times = [5, 10, 15]
53
53
  >>> max_times = [20, 20, 20]
54
54
  >>> origin_times = [0, 0, 5]
55
- >>> events, survival_times = switch_to_events_v2(classes, event_times, max_times, origin_times, FrameToMin=0.5)
55
+ >>> events, survival_times = switch_to_events(classes, event_times, max_times, origin_times, FrameToMin=0.5)
56
56
  # This would process the events considering left censorship and convert survival times to minutes.
57
57
 
58
58
  """
@@ -189,6 +189,7 @@ def compute_survival(df, class_of_interest, t_event, t_reference=None, FrameToMi
189
189
  assert class_of_interest in cols,"The requested class cannot be found in the dataframe..."
190
190
  assert t_event in cols,"The event time cannot be found in the dataframe..."
191
191
  left_censored = False
192
+ first_detections = None
192
193
 
193
194
  if not pairs:
194
195
  groupby_cols = ['position','TRACK_ID']
@@ -209,10 +210,7 @@ def compute_survival(df, class_of_interest, t_event, t_reference=None, FrameToMi
209
210
  assert t_reference in cols,"The reference time cannot be found in the dataframe..."
210
211
  first_detections = df.groupby(groupby_cols)[t_reference].max().values
211
212
 
212
-
213
- print(f"{classes=} {event_times=} {max_times=} {first_detections=}")
214
213
  events, survival_times = switch_to_events(classes, event_times, max_times, origin_times=first_detections, left_censored=left_censored, FrameToMin=FrameToMin, cut_observation_time=cut_observation_time)
215
- print(f"{events=} {survival_times=}")
216
214
 
217
215
  ks = KaplanMeierFitter()
218
216
  if len(events)>0:
@@ -0,0 +1,11 @@
1
+ class QueryError(Exception):
2
+ """Base class for query-related errors."""
3
+
4
+ class EmptyQueryError(QueryError):
5
+ pass
6
+
7
+ class MissingColumnsError(QueryError):
8
+ def __init__(self, missing_cols):
9
+ msg = f"The following columns are missing from the DataFrame: {missing_cols}"
10
+ super().__init__(msg)
11
+ self.missing_cols = missing_cols
@@ -245,6 +245,138 @@ def fraction_of_area_dark_intensity(regionmask, intensity_image, target_channel=
245
245
  return float(np.sum(subregion)) / float(np.sum(regionmask))
246
246
 
247
247
 
248
+ def area_dark_intensity_nintyfive(regionmask, intensity_image, target_channel='adhesion_channel', fill_holes=True): #, target_channel='adhesion_channel'
249
+
250
+ subregion = (intensity_image < 0.95)*regionmask # under one, under 0.8, under 0.6, whatever value!
251
+ if fill_holes:
252
+ subregion = skm.label(subregion, connectivity=2, background=0)
253
+ subregion = fill_label_holes(subregion)
254
+ subregion[subregion>0] = 1
255
+
256
+ return float(np.sum(subregion))
257
+
258
+ def area_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel', fill_holes=True): #, target_channel='adhesion_channel'
259
+
260
+ subregion = (intensity_image < 0.90)*regionmask # under one, under 0.8, under 0.6, whatever value!
261
+ if fill_holes:
262
+ subregion = skm.label(subregion, connectivity=2, background=0)
263
+ subregion = fill_label_holes(subregion)
264
+ subregion[subregion>0] = 1
265
+
266
+ return float(np.sum(subregion))
267
+
268
+ def mean_dark_intensity_nintyfive(regionmask, intensity_image, target_channel='adhesion_channel', fill_holes=True):
269
+ """
270
+ Calculate the mean intensity in a dark subregion below 95, handling NaN values.
271
+
272
+ """
273
+ subregion = (intensity_image < 0.95) * regionmask
274
+
275
+ if fill_holes:
276
+ subregion = skm.label(subregion, connectivity=2, background=0)
277
+ subregion = fill_label_holes(subregion)
278
+ subregion[subregion > 0] = 1
279
+
280
+
281
+ masked_intensity = intensity_image[subregion == 1]
282
+
283
+ return float(np.nanmean(masked_intensity))
284
+
285
+
286
+ def mean_dark_intensity_nintyfive_fillhole_false(regionmask, intensity_image, target_channel='adhesion_channel'):
287
+ """
288
+ Calculate the mean intensity in a dark subregion below 95, handling NaN values.
289
+ """
290
+ subregion = (intensity_image < 0.95) * regionmask # Select dark regions within the mask
291
+
292
+ masked_intensity = intensity_image[subregion == 1] # Extract pixel values from the selected region
293
+
294
+ return float(np.nanmean(masked_intensity)) # Compute mean, ignoring NaNs
295
+
296
+ def mean_dark_intensity_ninty_fillhole_false(regionmask, intensity_image, target_channel='adhesion_channel'):
297
+ """
298
+ Calculate the mean intensity in a dark subregion, handling NaN values.
299
+ """
300
+ subregion = (intensity_image < 0.90) * regionmask # Select dark regions within the mask
301
+
302
+ masked_intensity = intensity_image[subregion == 1] # Extract pixel values from the selected region
303
+
304
+ return float(np.nanmean(masked_intensity)) # Compute mean, ignoring NaNs
305
+
306
+
307
+ def mean_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel', fill_holes=True):
308
+ """
309
+ Calculate the mean intensity in a dark subregion below 90, handling NaN values.
310
+
311
+ """
312
+ subregion = (intensity_image < 0.90) * regionmask
313
+
314
+ if fill_holes:
315
+ subregion = skm.label(subregion, connectivity=2, background=0)
316
+ subregion = fill_label_holes(subregion)
317
+ subregion[subregion > 0] = 1
318
+
319
+
320
+ masked_intensity = intensity_image[subregion == 1]
321
+
322
+ return float(np.nanmean(masked_intensity))
323
+
324
+ def mean_dark_intensity_eight_five(regionmask, intensity_image, target_channel='adhesion_channel', fill_holes=True):
325
+ """
326
+ Calculate the mean intensity in a dark subregion below 85, handling NaN values.
327
+
328
+ """
329
+ subregion = (intensity_image < 0.85) * regionmask
330
+
331
+ if fill_holes:
332
+ subregion = skm.label(subregion, connectivity=2, background=0)
333
+ subregion = fill_label_holes(subregion)
334
+ subregion[subregion > 0] = 1
335
+
336
+
337
+ masked_intensity = intensity_image[subregion == 1]
338
+
339
+ return float(np.nanmean(masked_intensity))
340
+
341
+
342
+ def mean_dark_intensity_eight_five_fillhole_false(regionmask, intensity_image, target_channel='adhesion_channel'):
343
+
344
+ subregion = (intensity_image < 0.85) * regionmask # Select dark regions within the mask
345
+
346
+ masked_intensity = intensity_image[subregion == 1] # Extract pixel values from the selected region
347
+
348
+ return float(np.nanmean(masked_intensity)) # Compute mean, ignoring NaNs
349
+
350
+ def percentile_zero_one_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel'):
351
+
352
+ subregion = (intensity_image < 0.95) * regionmask
353
+ return float(np.nanpercentile(intensity_image[subregion],0.1))
354
+
355
+
356
+ def percentile_one_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel'):
357
+
358
+ subregion = (intensity_image < 0.95) * regionmask
359
+ return float(np.nanpercentile(intensity_image[subregion],1))
360
+
361
+
362
+ def percentile_five_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel'):
363
+
364
+ subregion = (intensity_image < 0.95) * regionmask
365
+ return float(np.nanpercentile(intensity_image[subregion],5))
366
+
367
+
368
+ def percentile_ten_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel'):
369
+
370
+ subregion = (intensity_image < 0.95) * regionmask
371
+ return float(np.nanpercentile(intensity_image[subregion],10))
372
+
373
+
374
+ def percentile_ninty_five_dark_intensity_ninty(regionmask, intensity_image, target_channel='adhesion_channel'):
375
+
376
+ subregion = (intensity_image < 0.95) * regionmask
377
+ return float(np.nanpercentile(intensity_image[subregion],95))
378
+
379
+
248
380
  def intensity_percentile_ninety_nine(regionmask, intensity_image):
249
381
  return np.nanpercentile(intensity_image[regionmask],99)
250
382
 
celldetective/filters.py CHANGED
@@ -1,4 +1,5 @@
1
- from skimage.filters import difference_of_gaussians, threshold_otsu, threshold_local, threshold_niblack, threshold_sauvola
1
+ from skimage.filters import difference_of_gaussians, threshold_multiotsu, threshold_otsu, threshold_local, \
2
+ threshold_niblack, threshold_sauvola
2
3
  from celldetective.utils import interpolate_nan
3
4
  import scipy.ndimage as snd
4
5
  import numpy as np
@@ -102,6 +103,11 @@ def otsu_filter(img, *kwargs):
102
103
  binary = img >= thresh
103
104
  return binary.astype(float)
104
105
 
106
+ def multiotsu_filter(img, classes=3, *kwargs):
107
+ thresholds = threshold_multiotsu(img, classes=classes)
108
+ regions = np.digitize(img, bins=thresholds)
109
+ return regions.astype(float)
110
+
105
111
  def local_filter(img, *kwargs):
106
112
  thresh = threshold_local(img.astype(float), *kwargs)
107
113
  binary = img >= thresh
@@ -1,29 +1,27 @@
1
+ import gc
2
+ import json
1
3
  import os
2
-
3
- from PyQt5.QtWidgets import QApplication, QMainWindow
4
- from PyQt5.QtWidgets import QFileDialog, QDialog, QWidget, QVBoxLayout, QCheckBox, QHBoxLayout, QLabel, QLineEdit, QPushButton, QMessageBox, QMenu, QAction
5
- from PyQt5.QtCore import Qt, QUrl
6
- from PyQt5.QtGui import QIcon, QDesktopServices, QIntValidator
7
-
8
4
  from glob import glob
9
- from superqt.fonticon import icon
10
- from fonticon_mdi6 import MDI6
11
-
12
- from celldetective.gui.about import AboutWidget
13
- from celldetective.io import correct_annotation
14
- from celldetective.utils import download_zenodo_file
15
- from celldetective.gui.gui_utils import center_window
16
- from celldetective.gui import Styles, ControlPanel, ConfigNewExperiment
5
+ from subprocess import Popen, check_output
17
6
 
18
- import gc
19
- from subprocess import check_output, Popen
7
+ from PyQt5.QtCore import QUrl, Qt
8
+ from PyQt5.QtGui import QDesktopServices, QIntValidator
9
+ from PyQt5.QtWidgets import QAction, QApplication, QCheckBox, QDialog, QFileDialog, QHBoxLayout, QLabel, QLineEdit, \
10
+ QMenu, QPushButton, QVBoxLayout
11
+ from fonticon_mdi6 import MDI6
20
12
  from psutil import cpu_count
21
- import json
13
+ from superqt.fonticon import icon
22
14
 
15
+ from celldetective.gui import ConfigNewExperiment, ControlPanel, CelldetectiveMainWindow, CelldetectiveWidget
16
+ from celldetective.gui.about import AboutWidget
17
+ from celldetective.gui.gui_utils import center_window, generic_message
23
18
  from celldetective.gui.processes.downloader import DownloadProcess
24
19
  from celldetective.gui.workers import ProgressWindow
20
+ from celldetective.io import correct_annotation, extract_well_name_and_number
21
+ from celldetective.utils import download_zenodo_file, pretty_table
25
22
 
26
- class AppInitWindow(QMainWindow, Styles):
23
+
24
+ class AppInitWindow(CelldetectiveMainWindow):
27
25
 
28
26
  """
29
27
  Initial window to set the experiment folder or create a new one.
@@ -36,7 +34,7 @@ class AppInitWindow(QMainWindow, Styles):
36
34
  self.parent_window = parent_window
37
35
  self.setWindowTitle("celldetective")
38
36
 
39
- self.n_threads = min([1,cpu_count()])
37
+ self.n_threads = min([1, cpu_count()])
40
38
 
41
39
  try:
42
40
  check_output('nvidia-smi')
@@ -48,7 +46,6 @@ class AppInitWindow(QMainWindow, Styles):
48
46
 
49
47
  self.soft_path = software_location
50
48
  self.onlyInt = QIntValidator()
51
- self.setWindowIcon(QIcon(os.sep.join([self.soft_path,'celldetective','icons','logo.png'])))
52
49
 
53
50
  self._createActions()
54
51
  self._createMenuBar()
@@ -58,9 +55,9 @@ class AppInitWindow(QMainWindow, Styles):
58
55
  self.geometry = self.screen.availableGeometry()
59
56
  self.screen_width, self.screen_height = self.geometry.getRect()[-2:]
60
57
 
61
- central_widget = QWidget()
58
+ central_widget = CelldetectiveWidget()
62
59
  self.vertical_layout = QVBoxLayout(central_widget)
63
- self.vertical_layout.setContentsMargins(15,15,15,15)
60
+ self.vertical_layout.setContentsMargins(15, 15, 15, 15)
64
61
  self.vertical_layout.addWidget(QLabel("Experiment folder:"))
65
62
  self.create_locate_exp_hbox()
66
63
  self.create_buttons_hbox()
@@ -79,14 +76,17 @@ class AppInitWindow(QMainWindow, Styles):
79
76
  def create_locate_exp_hbox(self):
80
77
 
81
78
  self.locate_exp_layout = QHBoxLayout()
82
- self.locate_exp_layout.setContentsMargins(0,5,0,0)
79
+ self.locate_exp_layout.setContentsMargins(0, 5, 0, 0)
83
80
  self.experiment_path_selection = QLineEdit()
84
81
  self.experiment_path_selection.setAlignment(Qt.AlignLeft)
85
82
  self.experiment_path_selection.setEnabled(True)
86
83
  self.experiment_path_selection.setDragEnabled(True)
87
84
  self.experiment_path_selection.setFixedWidth(430)
88
85
  self.experiment_path_selection.textChanged[str].connect(self.check_path_and_enable_opening)
89
- self.foldername = os.getcwd()
86
+ try:
87
+ self.foldername = os.getcwd()
88
+ except FileNotFoundError as e:
89
+ self.foldername = ""
90
90
  self.experiment_path_selection.setPlaceholderText('/path/to/experiment/folder/')
91
91
  self.locate_exp_layout.addWidget(self.experiment_path_selection, 90)
92
92
 
@@ -266,7 +266,7 @@ class AppInitWindow(QMainWindow, Styles):
266
266
 
267
267
  print('setting memory and threads')
268
268
 
269
- self.ThreadsWidget = QWidget()
269
+ self.ThreadsWidget = CelldetectiveWidget()
270
270
  self.ThreadsWidget.setWindowTitle("Threads")
271
271
  layout = QVBoxLayout()
272
272
  self.ThreadsWidget.setLayout(layout)
@@ -382,24 +382,21 @@ class AppInitWindow(QMainWindow, Styles):
382
382
  wells = glob(os.sep.join([self.exp_dir,"W*"]))
383
383
  self.number_of_wells = len(wells)
384
384
  if self.number_of_wells==0:
385
- msgBox = QMessageBox()
386
- msgBox.setIcon(QMessageBox.Critical)
387
- msgBox.setText("No well was found in the experiment folder.\nPlease respect the W*/ nomenclature...")
388
- msgBox.setWindowTitle("Error")
389
- msgBox.setStandardButtons(QMessageBox.Ok)
390
- returnValue = msgBox.exec()
391
- if returnValue == QMessageBox.Ok:
392
- return None
385
+ generic_message("No well was found in the experiment folder.\nPlease respect the W*/ nomenclature...", msg_type="critical")
386
+ return None
393
387
  else:
394
388
  if self.number_of_wells==1:
395
389
  print(f"Found {self.number_of_wells} well...")
396
390
  elif self.number_of_wells>1:
397
391
  print(f"Found {self.number_of_wells} wells...")
398
- number_pos = []
392
+
393
+ number_pos = {}
399
394
  for w in wells:
400
- position_folders = glob(os.sep.join([w,f"{w.split(os.sep)[-1][1]}*", os.sep]))
401
- number_pos.append(len(position_folders))
402
- print(f"Number of positions per well: {number_pos}")
395
+ well_name, well_nbr = extract_well_name_and_number(w)
396
+ position_folders = glob(os.sep.join([w,f"{well_nbr}*", os.sep]))
397
+ number_pos.update({well_name: len(position_folders)})
398
+ print(f"Number of positions per well:")
399
+ pretty_table(number_pos)
403
400
 
404
401
  with open(os.sep.join([self.soft_path,'celldetective','recent.txt']), 'a+') as f:
405
402
  f.write(self.exp_dir+'\n')
@@ -423,12 +420,6 @@ class AppInitWindow(QMainWindow, Styles):
423
420
  else:
424
421
  return None
425
422
  if not os.path.exists(os.sep.join([self.foldername,"config.ini"])):
426
- msgBox = QMessageBox()
427
- msgBox.setIcon(QMessageBox.Warning)
428
- msgBox.setText("No configuration can be found in the selected folder...")
429
- msgBox.setWindowTitle("Warning")
430
- msgBox.setStandardButtons(QMessageBox.Ok)
431
- returnValue = msgBox.exec()
432
- if returnValue == QMessageBox.Ok:
433
- self.experiment_path_selection.setText('')
434
- return None
423
+ generic_message("No configuration can be found in the selected folder...", msg_type="warning")
424
+ self.experiment_path_selection.setText('')
425
+ return None
@@ -1,21 +1,15 @@
1
1
  from .styles import Styles
2
- from .btrack_options import ConfigTracking
2
+ from .base_components import CelldetectiveWidget, CelldetectiveMainWindow
3
3
  from .json_readers import ConfigEditor
4
4
  from .tableUI import TableUI
5
- from .measurement_options import ConfigMeasurements
6
- from .neighborhood_options import ConfigNeighborhoods
7
5
  from .classifier_widget import ClassifierWidget
8
6
  from .survival_ui import ConfigSurvival
9
7
  from .plot_signals_ui import ConfigSignalPlot
10
- from .signal_annotator_options import ConfigSignalAnnotator
11
- from .signal_annotator import SignalAnnotator
12
- from .signal_annotator2 import SignalAnnotator2
13
- from .retrain_signal_model_options import ConfigSignalModelTraining
14
- from .retrain_segmentation_model_options import ConfigSegmentationModelTraining
8
+ from .event_annotator import EventAnnotator
9
+ from .pair_event_annotator import PairEventAnnotator
15
10
  from .thresholds_gui import ThresholdConfigWizard
16
11
  from .seg_model_loader import SegmentationModelLoader
17
12
  from .process_block import ProcessPanel, NeighPanel, PreprocessingPanel
18
13
  from .analyze_block import AnalysisPanel
19
14
  from .control_panel import ControlPanel
20
15
  from .configure_new_exp import ConfigNewExperiment
21
-
@@ -1,44 +1,48 @@
1
- from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel
1
+ from PyQt5.QtWidgets import QVBoxLayout, QLabel
2
2
  from PyQt5.QtGui import QPixmap
3
3
  from PyQt5.QtCore import Qt
4
+
5
+ from celldetective.gui import CelldetectiveWidget
4
6
  from celldetective.utils import get_software_location
5
7
  import os
6
8
  from celldetective.gui.gui_utils import center_window
7
9
  from celldetective._version import __version__
8
10
 
9
- class AboutWidget(QWidget):
10
11
 
12
+ class AboutWidget(CelldetectiveWidget):
13
+
11
14
  def __init__(self):
12
-
13
15
  super().__init__()
14
16
  self.setWindowTitle("About celldetective")
15
- self.setMinimumWidth(300)
17
+ self.setMaximumWidth(320)
16
18
  center_window(self)
17
- logo = QPixmap(os.sep.join([get_software_location(),'celldetective','icons','logo.png']))
18
-
19
+
20
+ logo = QPixmap(self.celldetective_logo_path)
21
+
19
22
  # Create the layout
20
23
  layout = QVBoxLayout(self)
21
24
  img_label = QLabel('')
22
25
  img_label.setPixmap(logo)
23
26
  layout.addWidget(img_label, alignment=Qt.AlignCenter)
24
-
27
+
25
28
  self.soft_name = QLabel('celldetective')
26
29
  self.soft_name.setStyleSheet("""font-weight: bold;
27
30
  font-size: 18px;
28
31
  """)
29
32
  layout.addWidget(self.soft_name, alignment=Qt.AlignCenter)
30
-
31
- self.version_lbl = QLabel(f"Version {__version__} <a href=\"https://github.com/remyeltorro/celldetective/releases\">(release notes)</a>")
33
+
34
+ self.version_lbl = QLabel(f"Version {__version__} <a href=\"https://github.com/celldetective/celldetective"
35
+ f"/releases\">(release notes)</a>")
32
36
  self.version_lbl.setOpenExternalLinks(True)
33
37
  layout.addWidget(self.version_lbl, alignment=Qt.AlignCenter)
34
-
38
+
35
39
  self.lab_lbl = QLabel("Developed at Laboratoire Adhésion et Inflammation (LAI) INSERM U1067 CNRS UMR 7333")
36
40
  self.lab_lbl.setWordWrap(True)
37
41
  layout.addWidget(self.lab_lbl, alignment=Qt.AlignCenter)
38
-
39
- self.centuri_mention = QLabel("The project leading to this publication has received funding from France 2030, the French Government program managed by the French National Research Agency (ANR-16-CONV-0001) and from Excellence Initiative of Aix-Marseille University - A*MIDEX')")
42
+
43
+ self.centuri_mention = QLabel(
44
+ "The project leading to this publication has received funding from France 2030, the French Government "
45
+ "program managed by the French National Research Agency (ANR-16-CONV-0001) and from Excellence Initiative "
46
+ "of Aix-Marseille University - A*MIDEX')")
40
47
  self.centuri_mention.setWordWrap(True)
41
48
  layout.addWidget(self.centuri_mention, alignment=Qt.AlignCenter)
42
-
43
-
44
-
@@ -1,11 +1,14 @@
1
1
  from PyQt5.QtWidgets import QFrame, QLabel, QPushButton, QVBoxLayout, \
2
- QSpacerItem, QSizePolicy
2
+ QSpacerItem, QSizePolicy
3
3
  from PyQt5.QtCore import Qt, QSize
4
4
  from PyQt5.QtGui import QIcon
5
- from celldetective.gui.plot_measurements import ConfigMeasurementsPlot
6
5
  from celldetective.gui import ConfigSurvival, ConfigSignalPlot
7
6
  import os
8
7
  from celldetective.gui import Styles
8
+ from glob import glob
9
+
10
+ from celldetective.gui.gui_utils import generic_message
11
+
9
12
 
10
13
  class AnalysisPanel(QFrame, Styles):
11
14
  def __init__(self, parent_window, title=None):
@@ -14,10 +17,11 @@ class AnalysisPanel(QFrame, Styles):
14
17
  self.parent_window = parent_window
15
18
  self.title = title
16
19
  if self.title is None:
17
- self.title=''
20
+ self.title = ''
18
21
  self.exp_channels = self.parent_window.exp_channels
19
22
  self.exp_dir = self.parent_window.exp_dir
20
23
  self.soft_path = self.parent_window.parent_window.soft_path
24
+ self.pop_exists = False
21
25
 
22
26
  self.setFrameStyle(QFrame.StyledPanel | QFrame.Raised)
23
27
  self.grid = QVBoxLayout(self)
@@ -40,7 +44,7 @@ class AnalysisPanel(QFrame, Styles):
40
44
  self.grid.addWidget(panel_title, alignment=Qt.AlignCenter)
41
45
 
42
46
  self.survival_btn = QPushButton("plot survival")
43
- self.survival_btn.setIcon(QIcon(QIcon(os.sep.join([self.soft_path,'celldetective','icons','survival2.png']))))
47
+ self.survival_btn.setIcon(QIcon(QIcon(os.sep.join([self.soft_path, 'celldetective', 'icons', 'survival2.png']))))
44
48
  self.survival_btn.setStyleSheet(self.button_style_sheet_2)
45
49
  self.survival_btn.setIconSize(QSize(35, 35))
46
50
  self.survival_btn.clicked.connect(self.configure_survival)
@@ -55,27 +59,38 @@ class AnalysisPanel(QFrame, Styles):
55
59
  self.grid.addWidget(signal_lbl, alignment=Qt.AlignCenter)
56
60
 
57
61
  self.plot_signal_btn = QPushButton("plot signals")
58
- self.plot_signal_btn.setIcon(QIcon(QIcon(os.sep.join([self.soft_path,'celldetective','icons','signals_icon.png']))))
62
+ self.plot_signal_btn.setIcon(QIcon(QIcon(os.sep.join([self.soft_path, 'celldetective', 'icons', 'signals_icon.png']))))
59
63
  self.plot_signal_btn.setStyleSheet(self.button_style_sheet_2)
60
64
  self.plot_signal_btn.setIconSize(QSize(35, 35))
61
65
  self.plot_signal_btn.clicked.connect(self.configure_plot_signals)
62
66
  self.grid.addWidget(self.plot_signal_btn)
63
67
 
64
- verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
65
- self.grid.addItem(verticalSpacer)
68
+ vertical_spacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
69
+ self.grid.addItem(vertical_spacer)
66
70
 
71
+ def check_for_tables(self):
72
+
73
+ for population in self.parent_window.populations:
74
+ tables = glob(self.exp_dir + os.sep.join(['W*', '*', 'output', 'tables', f'trajectories_{population}.csv']))
75
+ if len(tables) > 0:
76
+ self.pop_exists = True
77
+
67
78
  def configure_survival(self):
68
- print('survival analysis starting!!!')
69
- self.configSurvival = ConfigSurvival(self)
70
- self.configSurvival.show()
79
+
80
+ self.check_for_tables()
81
+ if self.pop_exists:
82
+ self.configSurvival = ConfigSurvival(self)
83
+ self.configSurvival.show()
84
+ else:
85
+ generic_message("No population table could be found... Abort...")
86
+ return None
71
87
 
72
88
  def configure_plot_signals(self):
73
- print('Configure a signal collapse representation...')
74
- self.ConfigSignalPlot = ConfigSignalPlot(self)
75
- self.ConfigSignalPlot.show()
76
-
77
- def configure_plot_measurements(self):
78
-
79
- print('plot measurements analysis starting!!!')
80
- self.ConfigMeasurementsPlot_wg = ConfigMeasurementsPlot(self)
81
- self.ConfigMeasurementsPlot_wg.show()
89
+
90
+ self.check_for_tables()
91
+ if self.pop_exists:
92
+ self.ConfigSignalPlot = ConfigSignalPlot(self)
93
+ self.ConfigSignalPlot.show()
94
+ else:
95
+ generic_message("No population table could be found... Abort...")
96
+ return None