Silhouette, Mosaic, Venn: Make selection a schema-only setting

Author: janezd

Orange/widgets/visualize/owmosaic.py

@@ -290,7 +290,7 @@ class Outputs:
     variable3 = ContextSetting(None)
     variable4 = ContextSetting(None)
     variable_color = ContextSetting(None)
-    selection = ContextSetting(set())
+    selection = Setting(set(), schema_only=True)
 
     BAR_WIDTH = 5
     SPACING = 4
@@ -317,7 +317,8 @@ def __init__(self):
         self.discrete_data = None
         self.subset_data = None
         self.subset_indices = None
-        self.__pending_selection = None
+        self.__pending_selection = self.selection
+        self.selection = set()
 
         self.color_data = None
 
@@ -443,7 +444,6 @@ def set_data(self, data):
 
         self.init_combos(self.data)
         self.openContext(self.data)
-        self.__pending_selection = self.selection
 
     @Inputs.data_subset
     def set_subset_data(self, data):
@@ -462,8 +462,14 @@ def handleNewSignals(self):
             else:
                 indices = {e.id for e in transformed}
                 self.subset_indices = [ex.id in indices for ex in self.data]
+        if self.data is not None and self.__pending_selection is not None:
+            self.selection = self.__pending_selection
+            self.__pending_selection = None
+        else:
+            self.selection = set()
         self.set_color_data()
-        self.reset_graph()
+        self.update_graph()
+        self.send_selection()
 
     def clear_selection(self):
         self.selection = set()
@@ -477,11 +483,6 @@ def coloring_changed(self):
     def reset_graph(self):
         self.clear_selection()
         self.update_graph()
-        if self.__pending_selection is not None:
-            self.selection = self.__pending_selection
-            self.__pending_selection = None
-            self.update_selection_rects()
-            self.send_selection()
 
     def set_color_data(self):
         if self.data is None:

Orange/widgets/visualize/owsilhouetteplot.py

@@ -76,7 +76,7 @@ class Outputs:
     add_scores = settings.Setting(False)
     auto_commit = settings.Setting(True)
 
-    pending_selection = settings.ContextSetting(None, schema_only=True)
+    pending_selection = settings.Setting(None, schema_only=True)
 
     Distances = [("Euclidean", Orange.distance.Euclidean),
                  ("Manhattan", Orange.distance.Manhattan),

Orange/widgets/visualize/owvenndiagram.py

@@ -57,7 +57,7 @@ class Outputs:
     selection: list
 
     # Selected disjoint subset indices
-    selection = settings.Setting([])
+    selection = settings.Setting([], schema_only=True)
     #: Stored input set hints
     #: {(index, inputname, attributes): (selectedattrname, itemsettitle)}
     #: The 'selectedattrname' can be None

Orange/widgets/visualize/tests/test_owmosaic.py

@@ -154,13 +154,35 @@ def test_selection_setting(self):
             QMouseEvent(QEvent.MouseButtonPress, QPoint(), Qt.LeftButton,
                         Qt.LeftButton, Qt.KeyboardModifiers()))
 
+        # Changing the data must reset the selection
+        self.send_signal(widget.Inputs.data, Table("titanic"))
+        self.assertFalse(bool(widget.selection))
+        self.assertIsNone(self.get_output(widget.Outputs.selected_data))
+
+        self.send_signal(widget.Inputs.data, data)
+        self.assertFalse(bool(widget.selection))
+        self.assertIsNone(self.get_output(widget.Outputs.selected_data))
+
+        widget.select_area(
+            1,
+            QMouseEvent(QEvent.MouseButtonPress, QPoint(), Qt.LeftButton,
+                        Qt.LeftButton, Qt.KeyboardModifiers()))
+        settings = self.widget.settingsHandler.pack_data(self.widget)
+
+        # Setting data to None must reset the selection
         self.send_signal(widget.Inputs.data, None)
         self.assertFalse(bool(widget.selection))
         self.assertIsNone(self.get_output(widget.Outputs.selected_data))
 
         self.send_signal(widget.Inputs.data, data)
-        self.assertEqual(widget.selection, {1})
-        self.assertIsNotNone(self.get_output(widget.Outputs.selected_data))
+        self.assertFalse(bool(widget.selection))
+        self.assertIsNone(self.get_output(widget.Outputs.selected_data))
+
+        w = self.create_widget(OWMosaicDisplay, stored_settings=settings)
+        self.assertFalse(bool(widget.selection))
+        self.send_signal(w.Inputs.data, data, widget=w)
+        self.assertEqual(w.selection, {1})
+        self.assertIsNotNone(self.get_output(w.Outputs.selected_data, widget=w))
 
 
 # Derive from WidgetTest to simplify creation of the Mosaic widget, although