Merge pull request #2801 from jerneju/new-signals-trees

[ENH] New signals: Trees, Forest

Author: lanzagar

Orange/widgets/visualize/owpythagorastree.py

@@ -8,11 +8,12 @@
 
 from Orange.base import TreeModel, SklModel
 from Orange.data.table import Table
-from Orange.widgets import gui, settings, widget
+from Orange.widgets import gui, settings
 from Orange.widgets.utils.annotated_data import (
     create_annotated_table,
     ANNOTATED_DATA_SIGNAL_NAME
 )
+from Orange.widgets.utils.signals import Input, Output
 from Orange.widgets.visualize.pythagorastreeviewer import (
     PythagorasTreeViewer,
     SquareGraphicsItem,
@@ -43,9 +44,12 @@ class OWPythagorasTree(OWWidget):
 
     priority = 1000
 
-    inputs = [('Tree', TreeModel, 'set_tree')]
-    outputs = [('Selected Data', Table, widget.Default),
-               (ANNOTATED_DATA_SIGNAL_NAME, Table)]
+    class Inputs:
+        tree = Input("Tree", TreeModel)
+
+    class Outputs:
+        selected_data = Output("Selected Data", Table, default=True)
+        annotated_data = Output(ANNOTATED_DATA_SIGNAL_NAME, Table)
 
     # Enable the save as feature
     graph_name = 'scene'
@@ -136,6 +140,7 @@ def __init__(self):
         # Clear the widget to correctly set the intial values
         self.clear()
 
+    @Inputs.tree
     def set_tree(self, model=None):
         """When a different tree is given."""
         self.clear()
@@ -185,8 +190,7 @@ def set_tree(self, model=None):
             #     self.depth_limit = model.meta_depth_limit
             #     self.update_depth()
 
-        self.send(ANNOTATED_DATA_SIGNAL_NAME,
-                  create_annotated_table(self.instances, None))
+        self.Outputs.annotated_data.send(create_annotated_table(self.instances, None))
 
     def clear(self):
         """Clear all relevant data from the widget."""
@@ -296,16 +300,15 @@ def onDeleteWidget(self):
     def commit(self):
         """Commit the selected data to output."""
         if self.instances is None:
-            self.send('Selected Data', None)
-            self.send(ANNOTATED_DATA_SIGNAL_NAME, None)
+            self.Outputs.selected_data.send(None)
+            self.Outputs.annotated_data.send(None)
             return
         nodes = [i.tree_node.label for i in self.scene.selectedItems()
                  if isinstance(i, SquareGraphicsItem)]
         data = self.tree_adapter.get_instances_in_nodes(nodes)
-        self.send('Selected Data', data)
+        self.Outputs.selected_data.send(data)
         selected_indices = self.tree_adapter.get_indices(nodes)
-        self.send(ANNOTATED_DATA_SIGNAL_NAME,
-                  create_annotated_table(self.instances, selected_indices))
+        self.Outputs.annotated_data.send(create_annotated_table(self.instances, selected_indices))
 
     def send_report(self):
         """Send report."""

Orange/widgets/visualize/owpythagoreanforest.py

@@ -9,6 +9,7 @@
 from Orange.base import RandomForestModel, TreeModel
 from Orange.data import Table
 from Orange.widgets import gui, settings
+from Orange.widgets.utils.signals import Input, Output
 from Orange.widgets.visualize.pythagorastreeviewer import (
     PythagorasTreeViewer,
     ContinuousTreeNode,
@@ -30,8 +31,11 @@ class OWPythagoreanForest(OWWidget):
 
     priority = 1001
 
-    inputs = [('Random forest', RandomForestModel, 'set_rf')]
-    outputs = [('Tree', TreeModel)]
+    class Inputs:
+        random_forest = Input("Random forest", RandomForestModel)
+
+    class Outputs:
+        tree = Output("Tree", TreeModel)
 
     # Enable the save as feature
     graph_name = 'scene'
@@ -110,6 +114,7 @@ def __init__(self):
 
         self.clear()
 
+    @Inputs.random_forest
     def set_rf(self, model=None):
         """When a different forest is given."""
         self.clear()
@@ -273,7 +278,7 @@ def commit(self):
             return
 
         if not self.scene.selectedItems():
-            self.send('Tree', None)
+            self.Outputs.tree.send(None)
             # The selected tree index should only reset when model changes
             if self.model is None:
                 self.selected_tree_index = -1
@@ -287,7 +292,7 @@ def commit(self):
         tree.meta_size_calc_idx = self.size_calc_idx
         tree.meta_depth_limit = self.depth_limit
 
-        self.send('Tree', tree)
+        self.Outputs.tree.send(tree)
 
     def send_report(self):
         """Send report."""

Orange/widgets/visualize/owtreeviewer.py

@@ -9,14 +9,15 @@
 from AnyQt.QtCore import Qt, QPointF, QSizeF, QRectF
 
 from Orange.base import TreeModel, SklModel
+from Orange.widgets.utils.signals import Input, Output
 from Orange.widgets.visualize.owtreeviewer2d import \
     GraphicsNode, GraphicsEdge, OWTreeViewer2D
 from Orange.widgets.utils import to_html
 from Orange.data import Table
 
 from Orange.widgets.settings import ContextSetting, ClassValuesContextHandler, \
     Setting
-from Orange.widgets import gui, widget
+from Orange.widgets import gui
 from Orange.widgets.utils.colorpalette import ContinuousPaletteGenerator
 from Orange.widgets.utils.annotated_data import (create_annotated_table,
                                                  ANNOTATED_DATA_SIGNAL_NAME)
@@ -158,21 +159,15 @@ class OWTreeGraph(OWTreeViewer2D):
     name = "Tree Viewer"
     icon = "icons/TreeViewer.svg"
     priority = 35
-    inputs = [
-        widget.InputSignal(
-            "Tree", TreeModel, "ctree",
-            # Had different input names before merging from
-            # Classification/Regression tree variants
-            replaces=["Classification Tree", "Regression Tree"])
-    ]
-    outputs = [
-        widget.OutputSignal(
-            "Selected Data", Table, widget.Default, id="selected-data",
-        ),
-        widget.OutputSignal(
-            ANNOTATED_DATA_SIGNAL_NAME, Table, id="annotated-data")
-    ]
 
+    class Inputs:
+        # Had different input names before merging from
+        # Classification/Regression tree variants
+        tree = Input("Tree", TreeModel, replaces=["Classification Tree", "Regression Tree"])
+
+    class Outputs:
+        selected_data = Output("Selected Data", Table, default=True, id="selected-data")
+        annotated_data = Output(ANNOTATED_DATA_SIGNAL_NAME, Table, id="annotated-data")
 
     settingsHandler = ClassValuesContextHandler()
     target_class_index = ContextSetting(0)
@@ -257,6 +252,7 @@ def toggle_color_reg(self):
         self.set_node_info()
         self.scene.update()
 
+    @Inputs.tree
     def ctree(self, model=None):
         """Input signal handler"""
         self.clear_scene()
@@ -297,9 +293,8 @@ def ctree(self, model=None):
                 self.tree_adapter.num_nodes,
                 len(self.tree_adapter.leaves(self.tree_adapter.root))))
         self.setup_scene()
-        self.send("Selected Data", None)
-        self.send(ANNOTATED_DATA_SIGNAL_NAME,
-                  create_annotated_table(self.dataset, []))
+        self.Outputs.selected_data.send(None)
+        self.Outputs.annotated_data.send(create_annotated_table(self.dataset, []))
 
     def walkcreate(self, node, parent=None):
         """Create a structure of tree nodes from the given model"""
@@ -324,10 +319,9 @@ def update_selection(self):
         nodes = [item.node_inst for item in self.scene.selectedItems()
                  if isinstance(item, TreeNode)]
         data = self.tree_adapter.get_instances_in_nodes(nodes)
-        self.send("Selected Data", data)
-        self.send(ANNOTATED_DATA_SIGNAL_NAME, create_annotated_table(
-            self.dataset,
-            self.tree_adapter.get_indices(nodes)))
+        self.Outputs.selected_data.send(data)
+        self.Outputs.annotated_data.send(create_annotated_table(
+            self.dataset, self.tree_adapter.get_indices(nodes)))
 
     def send_report(self):
         if not self.model: