celldetective 1.5.0b1__py3-none-any.whl → 1.5.0b3__py3-none-any.whl

celldetective/gui/gui_utils.py

@@ -822,10 +822,15 @@ def color_from_state(state, recently_modified=False):
     color_map = {}
     for value in unique_values:
 
-        if np.isnan(value):
-            value = "nan"
-            color_map[value] = "k"
-        elif value == 0:
+        try:
+            if np.isnan(value):
+                value = "nan"
+                color_map[value] = "k"
+                continue
+        except TypeError:
+            pass
+
+        if value == 0:
             color_map[value] = "tab:blue"
         elif value == 1:
             color_map[value] = "tab:red"
@@ -834,7 +839,11 @@ def color_from_state(state, recently_modified=False):
         else:
             import matplotlib.pyplot as plt
 
-            color_map[value] = plt.cm.tab20(value / 20.0)
+            if isinstance(value, (int, float, np.number)):
+                idx = value
+            else:
+                idx = hash(str(value)) % 20
+            color_map[value] = plt.cm.tab20(idx / 20.0)
 
     return color_map
 

celldetective/gui/interactions_block.py

@@ -23,7 +23,8 @@ from superqt.fonticon import icon
 
 import celldetective.gui.preprocessing_block
 from celldetective import get_software_location
-from celldetective.gui.base.components import QHSeperationLine
+from celldetective.gui.base.components import QHSeperationLine, HoverButton
+
 from celldetective.gui.base.styles import Styles
 from celldetective.gui.base.utils import center_window
 from celldetective.gui.gui_utils import help_generic
@@ -295,11 +296,12 @@ class NeighPanel(QFrame, Styles):
         self.refresh_signal_models()
         # self.to_disable.append(self.cell_models_list)
 
-        self.pair_train_signal_model_btn = QPushButton("TRAIN")
+        self.pair_train_signal_model_btn = HoverButton(
+            "TRAIN", MDI6.redo_variant, "black", "white"
+        )
         self.pair_train_signal_model_btn.setToolTip(
             "Train a cell pair event detection model."
         )
-        self.pair_train_signal_model_btn.setIcon(icon(MDI6.redo_variant, color="black"))
         self.pair_train_signal_model_btn.setIconSize(QSize(20, 20))
         self.pair_train_signal_model_btn.setStyleSheet(self.button_style_sheet_3)
         pair_model_zoo_layout.addWidget(self.pair_train_signal_model_btn, 5)
@@ -412,31 +414,59 @@ class NeighPanel(QFrame, Styles):
 
     def view_table_ui(self):
         from celldetective.gui.tableUI import TableUI
+        from celldetective.gui.workers import ProgressWindow
+        from celldetective.processes.load_table import TableLoaderProcess
 
         logger.info("Load table...")
-        self.load_available_tables()
 
-        if self.df is not None:
-            plot_mode = "static"
-            self.tab_ui = TableUI(
-                self.df,
-                f"{self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}",
-                population="pairs",
-                plot_mode=plot_mode,
-                save_inplace_option=True,
-            )
-            self.tab_ui.show()
-            center_window(self.tab_ui)
-        else:
-            logger.info("Table could not be loaded...")
-            msgBox = QMessageBox()
-            msgBox.setIcon(QMessageBox.Warning)
-            msgBox.setText("No table could be loaded...")
-            msgBox.setWindowTitle("Info")
-            msgBox.setStandardButtons(QMessageBox.Ok)
-            returnValue = msgBox.exec()
-            if returnValue == QMessageBox.Ok:
-                return None
+        # Prepare args for the process
+        self.well_option = self.parent_window.well_list.getSelectedIndices()
+        self.position_option = self.parent_window.position_list.getSelectedIndices()
+
+        process_args = {
+            "experiment": self.exp_dir,
+            "population": "pairs",
+            "well_option": self.well_option,
+            "position_option": self.position_option,
+            "show_frame_progress": False,
+        }
+
+        self.df = None
+
+        def on_table_loaded(df):
+            self.df = df
+            if self.df is not None:
+                plot_mode = "static"
+                self.tab_ui = TableUI(
+                    self.df,
+                    f"{self.parent_window.well_list.currentText()}; Position {self.parent_window.position_list.currentText()}",
+                    population="pairs",
+                    plot_mode=plot_mode,
+                    save_inplace_option=True,
+                )
+                self.tab_ui.show()
+                center_window(self.tab_ui)
+            else:
+                logger.info("Table could not be loaded...")
+                msgBox = QMessageBox()
+                msgBox.setIcon(QMessageBox.Warning)
+                msgBox.setText("No table could be loaded...")
+                msgBox.setWindowTitle("Info")
+                msgBox.setStandardButtons(QMessageBox.Ok)
+                returnValue = msgBox.exec()
+
+        self.job = ProgressWindow(
+            TableLoaderProcess,
+            parent_window=self,
+            title="Loading tables...",
+            process_args=process_args,
+            position_info=False,
+            well_label="Wells loaded:",
+            pos_label="Positions loaded:",
+        )
+        self.job._ProgressWindow__runner.signals.result.connect(on_table_loaded)
+
+        result = self.job.exec_()
 
     def activate_neigh_options(self):
 

celldetective/gui/interactive_timeseries_viewer.py

@@ -1,6 +1,14 @@
 import pandas as pd
 from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QComboBox, QDialog, QHBoxLayout, QLabel, QMessageBox, QPushButton, QVBoxLayout
+from PyQt5.QtWidgets import (
+    QComboBox,
+    QDialog,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QVBoxLayout,
+)
 from matplotlib import pyplot as plt
 from matplotlib.widgets import RectangleSelector
 
@@ -243,7 +251,9 @@ class InteractiveEventViewer(QDialog, Styles):
 
         # Plot
         self.fig = plt.figure(figsize=(8, 6))
+        self.fig.patch.set_alpha(0)
         self.canvas = FigureCanvas(self.fig, interactive=True)
+        self.canvas.setStyleSheet("background-color:transparent;")
         layout.addWidget(self.canvas)
 
         # Tooltip/Info