Merge pull request #67 from haesleinhuepf/bugfix_clusterplot_3d

Bugfix clusterplot didn't work with 3D data
haesleinhuepf · Aug 18, 2024 · 45877d7 · 45877d7
2 parents 3b7aa31 + f457f9a
commit 45877d7
Show file tree

Hide file tree

Showing 5 changed files with 315 additions and 4 deletions.
diff --git a/docs/clusterplot.ipynb b/docs/clusterplot.ipynb
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="stackview",
-    version="0.8.1",
+    version="0.8.2",
     author="Robert Haase",
     author_email="robert.haase@uni-leipzig.de",
     description="Interactive image stack viewing in jupyter notebooks",

diff --git a/stackview/__init__.py b/stackview/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"
 
 from ._static_view import jupyter_displayable_output, insight
 from ._utilities import merge_rgb

diff --git a/stackview/_clusterplot.py b/stackview/_clusterplot.py
@@ -42,6 +42,8 @@ def clusterplot(df, labels, column_x:str="x", column_y:str="y", column_selection
     from ._scatterplot import scatterplot
     import functools
 
+    labels = np.asarray(labels)
+
     if column_selection in df.columns:
         selection = df["selection"].tolist()
 
@@ -72,6 +74,7 @@ def update(selection, label_image, selected_image, widget):
 
     return grid([[
         image_display,
-        scatterplot
+        scatterplot,
+
     ]])
 
diff --git a/stackview/_scatterplot.py b/stackview/_scatterplot.py
@@ -120,7 +120,9 @@ def __init__(self, df, column_x, column_y, column_selection, figsize, selection_
         manager = Gcf.get_active()
         Gcf.figs.pop(manager.num, None)
 
-        self.selector = Selector(self.fig, self.ax, self.plotted_points, callback=self.set_selection)
+        self.selector = None
+        #self.selector = Selector(self.fig, self.ax, self.plotted_points, callback=self.set_selection)
+        self.update()
 
         # show selection if defined
         if column_selection in df.columns: