Merge pull request #355 from jfoster17/fix-subset-display-on-unlinked…

…-scatters Make sure invalid subsets don't display
glue-viz · May 12, 2023 · 8ec97fb · 8ec97fb
2 parents d3aa76f + 06748aa
commit 8ec97fb
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/glue_jupyter/bqplot/scatter/layer_artist.py b/glue_jupyter/bqplot/scatter/layer_artist.py
@@ -193,22 +193,27 @@ def update(self):
             try:
                 mask = self.layer.to_mask()
             except IncompatibleAttribute:
+                self.scatter.selected = []
+                self.quiver.selected = []
+                self._set_subset_styles()
                 self.disable("Could not compute subset")
-                self._clear_selection()
                 return
 
             selected_indices = np.nonzero(mask)[0].tolist()
 
             self.scatter.selected = selected_indices
-            self.scatter.selected_style = {}
-            self.scatter.unselected_style = {'fill': 'none', 'stroke': 'none'}
             self.quiver.selected = selected_indices
-            self.quiver.selected_style = {}
-            self.quiver.unselected_style = {'fill': 'none', 'stroke': 'none'}
+            self._set_subset_styles()
 
         else:
             self._clear_selection()
 
+    def _set_subset_styles(self):
+        self.scatter.selected_style = {}
+        self.scatter.unselected_style = {'fill': 'none', 'stroke': 'none'}
+        self.quiver.selected_style = {}
+        self.quiver.unselected_style = {'fill': 'none', 'stroke': 'none'}
+
     def _clear_selection(self):
         self.scatter.selected = None
         self.scatter.selected_style = {}