Merge pull request #353 from BiAPoL/escape-errors-on-mixed-layer-selection

Escape errors on mixed layer selection

Author: jo-mueller

src/napari_clusters_plotter/_new_plotter_widget.py

@@ -290,6 +290,18 @@ def _on_update_layer_selection(
         if self.n_selected_layers == 0:
             return
 
+        # check if the selected layers are of the correct type
+        selected_layer_types = [
+            type(layer) for layer in self.viewer.layers.selection
+        ]
+        for layer_type in selected_layer_types:
+            if layer_type not in self.input_layer_types:
+                return
+
+        # check if all selected layers are of the same type
+        if len(set(selected_layer_types)) > 1:
+            return
+
         self.layers = list(self.viewer.layers.selection)
         self._update_feature_selection(None)
 

src/napari_clusters_plotter/_tests/test_plotter.py

@@ -0,0 +1,27 @@
+import numpy as np
+
+
+def test_mixed_layers(make_napari_viewer):
+    from napari_clusters_plotter import PlotterWidget
+
+    viewer = make_napari_viewer()
+    widget = PlotterWidget(viewer)
+    viewer.window.add_dock_widget(widget, area="right")
+
+    random_image = np.random.random((5, 5))
+    sample_labels = np.array(
+        [
+            [
+                [0, 0, 0, 0, 1],
+                [0, 0, 0, 1, 1],
+                [0, 0, 1, 1, 1],
+                [0, 1, 1, 1, 1],
+                [1, 1, 1, 1, 1],
+            ]
+        ]
+    )
+
+    viewer.add_image(random_image)
+    viewer.add_labels(sample_labels)
+
+    #