OWSieveDiagram: Output Selected and Annotated Data

Orange/widgets/visualize/owsieve.py

@@ -12,9 +12,11 @@
 from Orange.preprocess import Discretize
 from Orange.preprocess.discretize import EqualFreq
 from Orange.statistics.contingency import get_contingency
-from Orange.widgets import gui
+from Orange.widgets import gui, widget
 from Orange.widgets.settings import DomainContextHandler, ContextSetting
 from Orange.widgets.utils import to_html as to_html
+from Orange.widgets.utils.annotated_data import (create_annotated_table,
+                                                 ANNOTATED_DATA_SIGNAL_NAME)
 from Orange.widgets.utils.itemmodels import VariableListModel
 from Orange.widgets.visualize.utils import (
     CanvasText, CanvasRectangle, ViewWithPress, VizRankDialogAttrPair)
@@ -60,7 +62,8 @@ class OWSieveDiagram(OWWidget):
 
     inputs = [("Data", Table, "set_data", Default),
               ("Features", AttributeList, "set_input_features")]
-    outputs = [("Selection", Table)]
+    outputs = [("Selected Data", Table, widget.Default),
+               (ANNOTATED_DATA_SIGNAL_NAME, Table)]
 
     graph_name = "canvas"
 
@@ -244,7 +247,9 @@ def update_selection(self):
         Filter and output the data.
         """
         if self.areas is None or not self.selection:
-            self.send("Selection", None)
+            self.send("Selected Data", None)
+            self.send(ANNOTATED_DATA_SIGNAL_NAME,
+                      create_annotated_table(self.data, []))
             return
 
         filts = []
@@ -267,11 +272,13 @@ def update_selection(self):
         else:
             filts = filter.Values(filts, conjunction=False)
         selection = filts(self.discrete_data)
+        idset = set(selection.ids)
+        sel_idx = [i for i, id in enumerate(self.data.ids) if id in idset]
         if self.discrete_data is not self.data:
-            idset = set(selection.ids)
-            sel_idx = [i for i, id in enumerate(self.data.ids) if id in idset]
             selection = self.data[sel_idx]
-        self.send("Selection", selection)
+        self.send("Selected Data", selection)
+        self.send(ANNOTATED_DATA_SIGNAL_NAME,
+                  create_annotated_table(self.data, sel_idx))
 
     def update_graph(self):
         # Function uses weird names like r, g, b, but it does it with utmost

Orange/widgets/visualize/tests/test_owsieve.py

@@ -0,0 +1,27 @@
+# Test methods with long descriptive names can omit docstrings
+# pylint: disable=missing-docstring
+from PyQt4.QtCore import QEvent, QPoint, Qt
+from PyQt4.QtGui import QMouseEvent
+
+from Orange.widgets.tests.base import WidgetTest, WidgetOutputsTestMixin
+from Orange.widgets.visualize.owsieve import OWSieveDiagram
+
+
+class TestOWSieveDiagram(WidgetTest, WidgetOutputsTestMixin):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        WidgetOutputsTestMixin.init(cls)
+
+        cls.signal_name = "Data"
+        cls.signal_data = cls.data
+
+    def setUp(self):
+        self.widget = self.create_widget(OWSieveDiagram)
+
+    def _select_data(self):
+        area = self.widget.areas[0]
+        self.widget.select_area(area, QMouseEvent(
+            QEvent.MouseButtonPress, QPoint(), Qt.LeftButton,
+            Qt.LeftButton, Qt.KeyboardModifiers()))
+        return [0, 4, 6, 7, 11, 17, 19, 21, 22, 24, 26, 39, 40, 43, 44, 46]