Scatter plot: save group selections

Author: markotoplak

Orange/widgets/visualize/owscatterplot.py

@@ -117,6 +117,7 @@ class Outputs:
         annotated_data = Output(ANNOTATED_DATA_SIGNAL_NAME, Table)
         features = Output("Features", Table, dynamic=False)
 
+    settings_version = 2
     settingsHandler = DomainContextHandler()
 
     auto_send_selection = Setting(True)
@@ -401,8 +402,9 @@ def apply_selection(self):
         """Apply selection saved in workflow."""
         if self.data is not None and self.selection is not None:
             self.graph.selection = np.zeros(len(self.data), dtype=np.uint8)
-            self.selection = [x for x in self.selection if x < len(self.data)]
-            self.graph.selection[self.selection] = 1
+            self.selection = [x for x in self.selection if x[0] < len(self.data)]
+            selection_array = np.array(self.selection).T
+            self.graph.selection[selection_array[0]] = selection_array[1]
             self.graph.update_colors(keep_colors=True)
 
     @Inputs.features
@@ -477,7 +479,7 @@ def send_data(self):
 
         # Store current selection in a setting that is stored in workflow
         if selection is not None and len(selection):
-            self.selection = list(selection)
+            self.selection = list(zip(selection, graph.selection[selection]))
         else:
             self.selection = None
 
@@ -520,6 +522,13 @@ def onDeleteWidget(self):
         self.graph.plot_widget.getViewBox().deleteLater()
         self.graph.plot_widget.clear()
 
+    @classmethod
+    def migrate_settings(cls, settings, version):
+        if "selection" in settings \
+                and settings["selection"] \
+                and not isinstance(settings["selection"][0], tuple):
+            settings["selection"] = [(a, 1) for a in settings["selection"]]
+
 
 def main(argv=None):
     import sys

Orange/widgets/visualize/tests/test_owscatterplot.py

@@ -227,7 +227,7 @@ def test_none_data(self):
 
     def test_points_selection(self):
         # Opening widget with saved selection should restore it
-        self.widget.selection = list(range(50))
+        self.widget.selection = [(i, 1) for i in range(50)]
         self.send_signal(self.widget.Inputs.data, self.data)  # iris
         selected_data = self.get_output(self.widget.Outputs.selected_data)
         self.assertEqual(len(selected_data), 50)
@@ -238,10 +238,15 @@ def test_points_selection(self):
         selected_data = self.get_output(self.widget.Outputs.selected_data)
         self.assertIsNone(selected_data)
 
+    def test_migrate_selection(self):
+        settings = dict(selection=list(range(2)))
+        OWScatterPlot.migrate_settings(settings, 0)
+        self.assertEqual(settings["selection"], [(0, 1), (1, 1)])
+
     def test_invalid_points_selection(self):
         # if selection contains rows that are not present in the current
         # dataset, widget should select what can be selected.
-        self.widget.selection = list(range(50))
+        self.widget.selection = [(i, 1) for i in range(50)]
         self.send_signal(self.widget.Inputs.data, self.data[:10])
         selected_data = self.get_output(self.widget.Outputs.selected_data)
         self.assertEqual(len(selected_data), 10)