celldetective 1.2.2.post1__tar.gz → 1.3.0__tar.gz

celldetective-1.3.0/PKG-INFO

@@ -0,0 +1,217 @@
+Metadata-Version: 2.1
+Name: celldetective
+Version: 1.3.0
+Summary: description
+Home-page: http://github.com/remyeltorro/celldetective
+Author: Rémy Torro
+Author-email: remy.torro@inserm.fr
+License: GPL-3.0
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: wheel
+Requires-Dist: nbsphinx
+Requires-Dist: nbsphinx_link
+Requires-Dist: sphinx_rtd_theme
+Requires-Dist: sphinx
+Requires-Dist: jinja2
+Requires-Dist: ipykernel
+Requires-Dist: stardist
+Requires-Dist: cellpose<3
+Requires-Dist: scikit-learn
+Requires-Dist: btrack
+Requires-Dist: tensorflow~=2.15.0
+Requires-Dist: napari
+Requires-Dist: tqdm
+Requires-Dist: mahotas
+Requires-Dist: fonticon-materialdesignicons6
+Requires-Dist: art
+Requires-Dist: lifelines
+Requires-Dist: setuptools
+Requires-Dist: scipy
+Requires-Dist: seaborn
+Requires-Dist: opencv-python-headless==4.7.0.72
+Requires-Dist: liblapack
+Requires-Dist: gputools
+Requires-Dist: lmfit
+Requires-Dist: superqt[cmap]
+Requires-Dist: setuptools
+Requires-Dist: matplotlib_scalebar
+Requires-Dist: numpy==1.26.4
+Requires-Dist: pytest
+Requires-Dist: pytest-qt
+Requires-Dist: h5py
+Requires-Dist: cliffs_delta
+
+# Celldetective
+
+<embed>
+    <p align="center">
+    <img src="https://github.com/remyeltorro/celldetective/blob/main/celldetective/icons/logo-large.png" width="33%" />
+    </p>
+</embed>
+
+![ico1](https://img.shields.io/readthedocs/celldetective?link=https%3A%2F%2Fcelldetective.readthedocs.io%2Fen%2Flatest%2Findex.html)
+![ico17](https://github.com/remyeltorro/celldetective/actions/workflows/test.yml/badge.svg)
+![ico4](https://img.shields.io/pypi/v/celldetective)
+![ico6](https://img.shields.io/github/downloads/remyeltorro/celldetective/total)
+![ico5](https://img.shields.io/pypi/dm/celldetective)
+![GitHub repo size](https://img.shields.io/github/repo-size/remyeltorro/celldetective)
+![GitHub License](https://img.shields.io/github/license/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fblob%2Fmain%2FLICENSE)
+![ico2](https://img.shields.io/github/forks/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fforks)
+![ico3](https://img.shields.io/github/stars/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fstargazers)
+
+Celldetective is a python package and graphical user interface to perform single-cell
+analysis on multimodal time lapse microscopy images.
+
+-  [Check the full documentation](https://celldetective.readthedocs.io)
+-  [Report a bug or request a new feature](https://github.com/remyeltorro/celldetective/issues/new/choose)
+-  [Explore the datasets, models and demos](https://zenodo.org/records/10650279)
+
+## Overview
+
+![Pipeline](https://github.com/remyeltorro/celldetective/raw/main/docs/source/_static/celldetective-blocks.png)
+
+
+Celldetective was designed to analyze time-lapse microscopy images in difficult situations: mixed cell populations that are only separable through multimodal information. This software provides a toolkit for the analysis of cell population interactions. 
+
+
+**Key features**: 
+- Achieve single-cell description (segment / track / measure) for up to two populations of interest
+- Signal annotation and traditional or Deep learning automation
+- Mask annotation in napari[^5] and retraining of Deep learning models
+- Neighborhood linking within and across populations and interaction annotations
+- Everything is done graphically, no coding is required!
+  
+Check out the [highlights](https://celldetective.readthedocs.io/en/latest/overview.html#description) in the documentation! 
+
+Instead of reinventing the wheel and out of respect for the amazing work done by these teams, we chose to build around StarDist[^1] & Cellpose[^2][^3] (BSD-3 license) for the Deep-learning segmentation and the Bayesian tracker bTrack[^4] (MIT license) for tracking. If you use these models or methods in your Celldetective workflow, don't forget to cite the respective papers!
+
+**Target Audience**: The software is targeted to scientists who are interested in quantifying dynamically (or not) cell populations from microscopy images. Experimental scientists who produce such images can also analyze their data, thanks to the graphical interface, that completely removes the need for coding, and the many helper functions that guide the user in the analysis steps. Finally, the modular structure of Celldetective welcomes users with a partial need. 
+
+![Signal analysis](https://github.com/remyeltorro/celldetective/raw/main/docs/source/_static/signal-annotator.gif)
+
+
+# System requirements
+
+## Hardware requirements
+
+The software was tested on several machines, including:
+
+-   An Intel(R) Core(TM) i9-10850K CPU @ 3.60GHz, with a single NVIDIA
+    GeForce RTX 3070 (8 Gb of memory) and 16 Gb of memory
+-   An Intel(R) Core(TM) i7-9750H CPU @ 2.60 GHz, with 16 Gb of memory
+
+In GPU mode, succesive segmentation and DL signal analysis could be
+performed without saturating the GPU memory thanks to the subprocess
+formulation for the different modules. The GPU can be disabled in the
+startup window. The software does not require a GPU (but model inference
+will be longer). 
+
+A typical analysis of a single movie with a GPU takes
+between 3 to 15 minutes. Depending on the number of cells and frames on
+the images, this computation time can increase to the order of half an
+hour on a CPU.
+
+Processing is performed frame by frame, therefore the memory requirement is extremely low. The main bottleneck is in the visualization of segmentation and tracking output. Whole stacks (typically 1-9 Gb) have to be loaded in memory at once to be viewed in napari. 
+
+## Software requirements
+
+The software was developed simulateously on Ubuntu 20.04 and Windows 11.
+It was tested on MacOS, but Tensorflow installation can require extra
+steps.
+
+-   Linux: Ubuntu 20.04.6 LTS (Focal Fossa)
+-   Windows: Windows 11 Home 23H2
+
+To use the software, you must install python, *e.g.* through
+[Anaconda](https://www.anaconda.com/download). Celldetective is routinely tested on both Ubuntu and Windows for Python versions 3.9, 3.10 and 3.11.
+
+# Installation
+
+## Stable release
+
+Celldetective requires a version of Python between 3.9 and 3.11 (included). If your Python version is older or more recent, consider using `conda` to create an environment as described below.
+
+With the proper Python version, Celldetective can be directly installed with `pip`:
+
+``` bash
+pip install celldetective
+```
+
+We recommend that you create an environment to use Celldetective, to protect your package versions and fix the Python version *e.g.*
+with `conda`:
+
+``` bash
+conda create -n celldetective python=3.11 pyqt
+conda activate celldetective
+pip install celldetective
+```
+
+Need an update? Simply type the following in the terminal (in your
+environment):
+
+``` bash
+pip install --upgrade celldetective
+```
+
+For more installation options, please check the [documentation](https://celldetective.readthedocs.io/en/latest/get-started.html#installation).
+
+
+# Quick start
+
+You can launch the GUI by 1) opening a terminal and 2) typing the
+following:
+
+``` bash
+# conda activate celldetective
+python -m celldetective
+```
+
+For more information about how to get started, please check the [documentation](https://celldetective.readthedocs.io/en/latest/get-started.html#launching-the-gui).
+
+# How to cite?
+
+If you use this software in your research, please cite the
+[Celldetective](https://www.biorxiv.org/content/10.1101/2024.03.15.585250v1)
+paper (currently preprint):
+
+``` raw
+@article {Torro2024.03.15.585250,
+    author = {R{\'e}my Torro and Beatriz D{\`\i}az-Bello and Dalia El Arawi and Lorna Ammer and Patrick Chames and Kheya Sengupta and Laurent Limozin},
+    title = {Celldetective: an AI-enhanced image analysis tool for unraveling dynamic cell interactions},
+    elocation-id = {2024.03.15.585250},
+    year = {2024},
+    doi = {10.1101/2024.03.15.585250},
+    publisher = {Cold Spring Harbor Laboratory},
+    abstract = {A current key challenge in bioimaging is the analysis of multimodal and multidimensional data reporting dynamic interactions between diverse cell populations. We developed Celldetective, a software that integrates AI-based segmentation and tracking algorithms and automated signal analysis into a user-friendly graphical interface. It offers complete interactive visualization, annotation, and training capabilities. We demonstrate it by analyzing original experimental data of spreading immune effector cells as well as antibody-dependent cell cytotoxicity events using multimodal fluorescence microscopy.Competing Interest StatementThe authors have declared no competing interest.},
+    URL = {https://www.biorxiv.org/content/early/2024/03/17/2024.03.15.585250},
+    eprint = {https://www.biorxiv.org/content/early/2024/03/17/2024.03.15.585250.full.pdf},
+    journal = {bioRxiv}
+}
+```
+
+Make sure you to cite the papers of any segmentation model (StarDist,
+Cellpose) or tracker (bTrack) you used through Celldetective.
+
+# Bibliography
+
+[^1]: Schmidt, U., Weigert, M., Broaddus, C. & Myers, G. Cell Detection
+    with Star-Convex Polygons. in Medical Image Computing and Computer
+    Assisted Intervention -- MICCAI 2018 (eds. Frangi, A. F., Schnabel,
+    J. A., Davatzikos, C., Alberola-López, C. & Fichtinger, G.) 265--273
+    (Springer International Publishing, Cham, 2018).
+    <doi:10.1007/978-3-030-00934-2_30>.
+
+[^2]: Stringer, C., Wang, T., Michaelos, M. & Pachitariu, M. Cellpose: a
+    generalist algorithm for cellular segmentation. Nat Methods 18,
+    100--106 (2021).
+
+[^3]: Pachitariu, M. & Stringer, C. Cellpose 2.0: how to train your own
+    model. Nat Methods 19, 1634--1641 (2022).
+
+[^4]: Ulicna, K., Vallardi, G., Charras, G. & Lowe, A. R. Automated Deep
+    Lineage Tree Analysis Using a Bayesian Single Cell Tracking
+    Approach. Frontiers in Computer Science 3, (2021).
+
+[^5]: Ahlers, J. et al. napari: a multi-dimensional image viewer for
+    Python. Zenodo <https://doi.org/10.5281/zenodo.8115575> (2023).

celldetective-1.3.0/README.md

@@ -0,0 +1,173 @@
+# Celldetective
+
+<embed>
+    <p align="center">
+    <img src="https://github.com/remyeltorro/celldetective/blob/main/celldetective/icons/logo-large.png" width="33%" />
+    </p>
+</embed>
+
+![ico1](https://img.shields.io/readthedocs/celldetective?link=https%3A%2F%2Fcelldetective.readthedocs.io%2Fen%2Flatest%2Findex.html)
+![ico17](https://github.com/remyeltorro/celldetective/actions/workflows/test.yml/badge.svg)
+![ico4](https://img.shields.io/pypi/v/celldetective)
+![ico6](https://img.shields.io/github/downloads/remyeltorro/celldetective/total)
+![ico5](https://img.shields.io/pypi/dm/celldetective)
+![GitHub repo size](https://img.shields.io/github/repo-size/remyeltorro/celldetective)
+![GitHub License](https://img.shields.io/github/license/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fblob%2Fmain%2FLICENSE)
+![ico2](https://img.shields.io/github/forks/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fforks)
+![ico3](https://img.shields.io/github/stars/remyeltorro/celldetective?link=https%3A%2F%2Fgithub.com%2Fremyeltorro%2Fcelldetective%2Fstargazers)
+
+Celldetective is a python package and graphical user interface to perform single-cell
+analysis on multimodal time lapse microscopy images.
+
+-  [Check the full documentation](https://celldetective.readthedocs.io)
+-  [Report a bug or request a new feature](https://github.com/remyeltorro/celldetective/issues/new/choose)
+-  [Explore the datasets, models and demos](https://zenodo.org/records/10650279)
+
+## Overview
+
+![Pipeline](https://github.com/remyeltorro/celldetective/raw/main/docs/source/_static/celldetective-blocks.png)
+
+
+Celldetective was designed to analyze time-lapse microscopy images in difficult situations: mixed cell populations that are only separable through multimodal information. This software provides a toolkit for the analysis of cell population interactions. 
+
+
+**Key features**: 
+- Achieve single-cell description (segment / track / measure) for up to two populations of interest
+- Signal annotation and traditional or Deep learning automation
+- Mask annotation in napari[^5] and retraining of Deep learning models
+- Neighborhood linking within and across populations and interaction annotations
+- Everything is done graphically, no coding is required!
+  
+Check out the [highlights](https://celldetective.readthedocs.io/en/latest/overview.html#description) in the documentation! 
+
+Instead of reinventing the wheel and out of respect for the amazing work done by these teams, we chose to build around StarDist[^1] & Cellpose[^2][^3] (BSD-3 license) for the Deep-learning segmentation and the Bayesian tracker bTrack[^4] (MIT license) for tracking. If you use these models or methods in your Celldetective workflow, don't forget to cite the respective papers!
+
+**Target Audience**: The software is targeted to scientists who are interested in quantifying dynamically (or not) cell populations from microscopy images. Experimental scientists who produce such images can also analyze their data, thanks to the graphical interface, that completely removes the need for coding, and the many helper functions that guide the user in the analysis steps. Finally, the modular structure of Celldetective welcomes users with a partial need. 
+
+![Signal analysis](https://github.com/remyeltorro/celldetective/raw/main/docs/source/_static/signal-annotator.gif)
+
+
+# System requirements
+
+## Hardware requirements
+
+The software was tested on several machines, including:
+
+-   An Intel(R) Core(TM) i9-10850K CPU @ 3.60GHz, with a single NVIDIA
+    GeForce RTX 3070 (8 Gb of memory) and 16 Gb of memory
+-   An Intel(R) Core(TM) i7-9750H CPU @ 2.60 GHz, with 16 Gb of memory
+
+In GPU mode, succesive segmentation and DL signal analysis could be
+performed without saturating the GPU memory thanks to the subprocess
+formulation for the different modules. The GPU can be disabled in the
+startup window. The software does not require a GPU (but model inference
+will be longer). 
+
+A typical analysis of a single movie with a GPU takes
+between 3 to 15 minutes. Depending on the number of cells and frames on
+the images, this computation time can increase to the order of half an
+hour on a CPU.
+
+Processing is performed frame by frame, therefore the memory requirement is extremely low. The main bottleneck is in the visualization of segmentation and tracking output. Whole stacks (typically 1-9 Gb) have to be loaded in memory at once to be viewed in napari. 
+
+## Software requirements
+
+The software was developed simulateously on Ubuntu 20.04 and Windows 11.
+It was tested on MacOS, but Tensorflow installation can require extra
+steps.
+
+-   Linux: Ubuntu 20.04.6 LTS (Focal Fossa)
+-   Windows: Windows 11 Home 23H2
+
+To use the software, you must install python, *e.g.* through
+[Anaconda](https://www.anaconda.com/download). Celldetective is routinely tested on both Ubuntu and Windows for Python versions 3.9, 3.10 and 3.11.
+
+# Installation
+
+## Stable release
+
+Celldetective requires a version of Python between 3.9 and 3.11 (included). If your Python version is older or more recent, consider using `conda` to create an environment as described below.
+
+With the proper Python version, Celldetective can be directly installed with `pip`:
+
+``` bash
+pip install celldetective
+```
+
+We recommend that you create an environment to use Celldetective, to protect your package versions and fix the Python version *e.g.*
+with `conda`:
+
+``` bash
+conda create -n celldetective python=3.11 pyqt
+conda activate celldetective
+pip install celldetective
+```
+
+Need an update? Simply type the following in the terminal (in your
+environment):
+
+``` bash
+pip install --upgrade celldetective
+```
+
+For more installation options, please check the [documentation](https://celldetective.readthedocs.io/en/latest/get-started.html#installation).
+
+
+# Quick start
+
+You can launch the GUI by 1) opening a terminal and 2) typing the
+following:
+
+``` bash
+# conda activate celldetective
+python -m celldetective
+```
+
+For more information about how to get started, please check the [documentation](https://celldetective.readthedocs.io/en/latest/get-started.html#launching-the-gui).
+
+# How to cite?
+
+If you use this software in your research, please cite the
+[Celldetective](https://www.biorxiv.org/content/10.1101/2024.03.15.585250v1)
+paper (currently preprint):
+
+``` raw
+@article {Torro2024.03.15.585250,
+    author = {R{\'e}my Torro and Beatriz D{\`\i}az-Bello and Dalia El Arawi and Lorna Ammer and Patrick Chames and Kheya Sengupta and Laurent Limozin},
+    title = {Celldetective: an AI-enhanced image analysis tool for unraveling dynamic cell interactions},
+    elocation-id = {2024.03.15.585250},
+    year = {2024},
+    doi = {10.1101/2024.03.15.585250},
+    publisher = {Cold Spring Harbor Laboratory},
+    abstract = {A current key challenge in bioimaging is the analysis of multimodal and multidimensional data reporting dynamic interactions between diverse cell populations. We developed Celldetective, a software that integrates AI-based segmentation and tracking algorithms and automated signal analysis into a user-friendly graphical interface. It offers complete interactive visualization, annotation, and training capabilities. We demonstrate it by analyzing original experimental data of spreading immune effector cells as well as antibody-dependent cell cytotoxicity events using multimodal fluorescence microscopy.Competing Interest StatementThe authors have declared no competing interest.},
+    URL = {https://www.biorxiv.org/content/early/2024/03/17/2024.03.15.585250},
+    eprint = {https://www.biorxiv.org/content/early/2024/03/17/2024.03.15.585250.full.pdf},
+    journal = {bioRxiv}
+}
+```
+
+Make sure you to cite the papers of any segmentation model (StarDist,
+Cellpose) or tracker (bTrack) you used through Celldetective.
+
+# Bibliography
+
+[^1]: Schmidt, U., Weigert, M., Broaddus, C. & Myers, G. Cell Detection
+    with Star-Convex Polygons. in Medical Image Computing and Computer
+    Assisted Intervention -- MICCAI 2018 (eds. Frangi, A. F., Schnabel,
+    J. A., Davatzikos, C., Alberola-López, C. & Fichtinger, G.) 265--273
+    (Springer International Publishing, Cham, 2018).
+    <doi:10.1007/978-3-030-00934-2_30>.
+
+[^2]: Stringer, C., Wang, T., Michaelos, M. & Pachitariu, M. Cellpose: a
+    generalist algorithm for cellular segmentation. Nat Methods 18,
+    100--106 (2021).
+
+[^3]: Pachitariu, M. & Stringer, C. Cellpose 2.0: how to train your own
+    model. Nat Methods 19, 1634--1641 (2022).
+
+[^4]: Ulicna, K., Vallardi, G., Charras, G. & Lowe, A. R. Automated Deep
+    Lineage Tree Analysis Using a Bayesian Single Cell Tracking
+    Approach. Frontiers in Computer Science 3, (2021).
+
+[^5]: Ahlers, J. et al. napari: a multi-dimensional image viewer for
+    Python. Zenodo <https://doi.org/10.5281/zenodo.8115575> (2023).

{celldetective-1.2.2.post1 → celldetective-1.3.0}/celldetective/__init__.py

@@ -1,3 +1,4 @@
+from ._version import __version__
 #from .tracking import track, clean_trajectories
 #from .measure import contour_of_instance_segmentation
 

celldetective-1.3.0/celldetective/__main__.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+import sys
+from PyQt5.QtWidgets import QApplication, QSplashScreen
+from PyQt5.QtGui import QPixmap
+from os import sep
+from celldetective.utils import get_software_location
+from time import time, sleep
+#os.environ['QT_DEBUG_PLUGINS'] = '1'
+
+if __name__ == "__main__":
+
+	splash=True
+	print('Loading the libraries...')
+
+	App = QApplication(sys.argv)
+	App.setStyle("Fusion")
+
+	if splash:
+		start = time()
+		splash_pix = QPixmap(sep.join([get_software_location(),'celldetective','icons','splash.png']))
+		splash = QSplashScreen(splash_pix)
+		splash.setMask(splash_pix.mask())
+		splash.show()
+		#App.processEvents(QEventLoop.AllEvents, 300)
+		while time() - start < 1:
+			sleep(0.001)
+			App.processEvents()
+
+	from PyQt5.QtWidgets import QFileDialog, QWidget, QVBoxLayout, QCheckBox, QHBoxLayout, QLabel, QLineEdit, QPushButton, QMessageBox, QMenu, QAction
+	from PyQt5.QtGui import QIcon, QDesktopServices, QIntValidator
+	from celldetective.gui.InitWindow import AppInitWindow
+
+	print('Libraries successfully loaded...')
+
+	window = AppInitWindow(App)
+
+	if splash:
+		splash.finish(window)
+
+	sys.exit(App.exec())

celldetective-1.3.0/celldetective/_version.py

@@ -0,0 +1 @@
+__version__ = "1.3.0"

{celldetective-1.2.2.post1 → celldetective-1.3.0}/celldetective/events.py

@@ -117,6 +117,11 @@ def compute_survival(df, class_of_interest, t_event, t_reference=None, FrameToMi
 	event_times = df.groupby(['position','TRACK_ID'])[t_event].min().values
 	max_times = df.groupby(['position','TRACK_ID'])['FRAME'].max().values
 
+	if t_reference=="0" or t_reference==0:
+		t_reference = None
+		left_censored = False
+		first_detections = None
+
 	if t_reference is not None:
 		left_censored = True
 		assert t_reference in cols,"The reference time cannot be found in the dataframe..."

celldetective-1.2.2.post1/celldetective/__main__.py → celldetective-1.3.0/celldetective/gui/InitWindow.py

@@ -1,13 +1,22 @@
-#!/usr/bin/env python3
-import sys
-from PyQt5.QtWidgets import QApplication, QSplashScreen, QMainWindow
-from PyQt5.QtGui import QPixmap
-from os import sep
+from PyQt5.QtWidgets import QApplication, QMainWindow
 from celldetective.utils import get_software_location
-#from PyQt5.QtCore import QEventLoop
-from time import time, sleep
 import os
-#os.environ['QT_DEBUG_PLUGINS'] = '1'
+from PyQt5.QtWidgets import QFileDialog, QWidget, QVBoxLayout, QCheckBox, QHBoxLayout, QLabel, QLineEdit, QPushButton, QMessageBox, QMenu, QAction
+from PyQt5.QtCore import Qt, QUrl
+from PyQt5.QtGui import QIcon, QDesktopServices, QIntValidator
+from glob import glob
+from superqt.fonticon import icon
+from fonticon_mdi6 import MDI6
+import gc
+from celldetective.gui import Styles, ControlPanel, ConfigNewExperiment
+from celldetective.gui.gui_utils import center_window
+import subprocess
+import os
+from celldetective.gui.about import AboutWidget
+from celldetective.io import correct_annotation
+import psutil
+import subprocess
+import json
 
 class AppInitWindow(QMainWindow):
 
@@ -389,54 +398,3 @@ class AppInitWindow(QMainWindow):
 			if returnValue == QMessageBox.Ok:
 				self.experiment_path_selection.setText('')
 				return None
-
-if __name__ == "__main__":
-
-	# import ctypes
-	# myappid = 'mycompany.myproduct.subproduct.version' # arbitrary string
-	# ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
-	splash=True
-	print('Loading the libraries...')
-
-	App = QApplication(sys.argv)
-	#App.setWindowIcon(QIcon(os.sep.join([get_software_location(),'celldetective','icons','mexican-hat.png'])))
-	App.setStyle("Fusion")
-
-	if splash:
-		start = time()
-		splash_pix = QPixmap(sep.join([get_software_location(),'celldetective','icons','splash.png']))
-		splash = QSplashScreen(splash_pix)
-		splash.setMask(splash_pix.mask())
-		splash.show()
-		#App.processEvents(QEventLoop.AllEvents, 300)
-		while time() - start < 1:
-			sleep(0.001)
-			App.processEvents()
-
-	from PyQt5.QtWidgets import QFileDialog, QWidget, QVBoxLayout, QCheckBox, QHBoxLayout, QLabel, QLineEdit, QPushButton, QMessageBox, QMenu, QAction
-	from PyQt5.QtCore import Qt, QUrl
-	from PyQt5.QtGui import QIcon, QDesktopServices, QIntValidator
-	from glob import glob
-	from superqt.fonticon import icon
-	from fonticon_mdi6 import MDI6
-	import gc
-	from celldetective.gui import Styles, ControlPanel, ConfigNewExperiment
-	from celldetective.gui.gui_utils import center_window
-	import subprocess
-	import os
-	from celldetective.gui.about import AboutWidget
-	from celldetective.io import correct_annotation
-	import psutil
-	import subprocess
-	import json
-	# import matplotlib
-	# matplotlib.rcParams.update({'font.size': 8})
-
-	print('Libraries successfully loaded...')
-
-	window = AppInitWindow(App)
-
-	if splash:
-		splash.finish(window)
-
-	sys.exit(App.exec())

{celldetective-1.2.2.post1 → celldetective-1.3.0}/celldetective/gui/about.py

@@ -4,6 +4,7 @@ from PyQt5.QtCore import Qt
 from celldetective.utils import get_software_location
 import os
 from celldetective.gui.gui_utils import center_window
+from celldetective._version import __version__
 
 class AboutWidget(QWidget):
 
@@ -27,7 +28,7 @@ class AboutWidget(QWidget):
 									""")
 		layout.addWidget(self.soft_name, alignment=Qt.AlignCenter)
 
-		self.version_lbl = QLabel(f"Version X.X.X <a href=\"https://github.com/remyeltorro/celldetective/releases\">(release notes)</a>")
+		self.version_lbl = QLabel(f"Version {__version__} <a href=\"https://github.com/remyeltorro/celldetective/releases\">(release notes)</a>")
 		self.version_lbl.setOpenExternalLinks(True)
 		layout.addWidget(self.version_lbl, alignment=Qt.AlignCenter)
 

{celldetective-1.2.2.post1 → celldetective-1.3.0}/celldetective/gui/classifier_widget.py

@@ -10,7 +10,7 @@ import numpy as np
 import matplotlib.pyplot as plt
 import json
 
-from celldetective.gui.gui_utils import FigureCanvas, center_window, color_from_status, help_generic
+from celldetective.gui.gui_utils import FigureCanvas, center_window, color_from_status, help_generic, color_from_class
 from celldetective.gui import Styles
 from celldetective.utils import get_software_location
 from celldetective.measure import classify_cells_from_query, interpret_track_classification
@@ -242,37 +242,42 @@ class ClassifierWidget(QWidget, Styles):
 
 	def update_props_scatter(self, feature_changed=True):
 
-		if not self.project_times:
-			self.scat_props.set_offsets(self.df.loc[self.df['FRAME']==self.currentFrame,[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
-			colors = [color_from_status(c) for c in self.df.loc[self.df['FRAME']==self.currentFrame,self.class_name].to_numpy()]
-			self.scat_props.set_facecolor(colors)
-			self.scat_props.set_alpha(self.currentAlpha)
-			self.ax_props.set_xlabel(self.features_cb[1].currentText())
-			self.ax_props.set_ylabel(self.features_cb[0].currentText())
-		else:
-			self.scat_props.set_offsets(self.df[[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
-			colors = [color_from_class(c) for c in self.df[self.class_name].to_numpy()]
-			self.scat_props.set_facecolor(colors)
-			self.scat_props.set_alpha(self.currentAlpha)
-			self.ax_props.set_xlabel(self.features_cb[1].currentText())
-			self.ax_props.set_ylabel(self.features_cb[0].currentText())
-
-
-		feat_x = self.features_cb[1].currentText()
-		feat_y = self.features_cb[0].currentText()
-		min_x = self.df.dropna(subset=feat_x)[feat_x].min()
-		max_x = self.df.dropna(subset=feat_x)[feat_x].max()
-		min_y = self.df.dropna(subset=feat_y)[feat_y].min()
-		max_y = self.df.dropna(subset=feat_y)[feat_y].max()
-
-		if min_x==min_x and max_x==max_x:
-			self.ax_props.set_xlim(min_x, max_x)
-		if min_y==min_y and max_y==max_y:
-			self.ax_props.set_ylim(min_y, max_y)
+		try:
+
+			if not self.project_times:
+				self.scat_props.set_offsets(self.df.loc[self.df['FRAME']==self.currentFrame,[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
+				colors = [color_from_status(c) for c in self.df.loc[self.df['FRAME']==self.currentFrame,self.class_name].to_numpy()]
+				self.scat_props.set_facecolor(colors)
+				self.scat_props.set_alpha(self.currentAlpha)
+				self.ax_props.set_xlabel(self.features_cb[1].currentText())
+				self.ax_props.set_ylabel(self.features_cb[0].currentText())
+			else:
+				self.scat_props.set_offsets(self.df[[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
+				colors = [color_from_status(c) for c in self.df[self.class_name].to_numpy()]
+				self.scat_props.set_facecolor(colors)
+				self.scat_props.set_alpha(self.currentAlpha)
+				self.ax_props.set_xlabel(self.features_cb[1].currentText())
+				self.ax_props.set_ylabel(self.features_cb[0].currentText())
+
+
+			feat_x = self.features_cb[1].currentText()
+			feat_y = self.features_cb[0].currentText()
+			min_x = self.df.dropna(subset=feat_x)[feat_x].min()
+			max_x = self.df.dropna(subset=feat_x)[feat_x].max()
+			min_y = self.df.dropna(subset=feat_y)[feat_y].min()
+			max_y = self.df.dropna(subset=feat_y)[feat_y].max()
+
+			if min_x==min_x and max_x==max_x:
+				self.ax_props.set_xlim(min_x, max_x)
+			if min_y==min_y and max_y==max_y:
+				self.ax_props.set_ylim(min_y, max_y)
+			
+			if feature_changed:
+				self.propscanvas.canvas.toolbar.update()
+			self.propscanvas.canvas.draw_idle()
 		
-		if feature_changed:
-			self.propscanvas.canvas.toolbar.update()
-		self.propscanvas.canvas.draw_idle()
+		except Exception as e:
+			pass
 
 	def apply_property_query(self):