Tree Viewer: new signals and minor refactoring

Author: jerneju

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:

Orange/widgets/visualize/tests/test_owtreegraph.py

@@ -38,16 +38,18 @@ def _select_data(self):
 
     def test_target_class_changed(self):
         """Check if node content has changed after selecting target class"""
-        self.send_signal(self.signal_name, self.signal_data)
-        nodes = self.widget.scene.nodes()
+        w = self.widget
+        self.send_signal(w.Inputs.tree, self.signal_data)
+        nodes = w.scene.nodes()
         text = nodes[0].toPlainText()
-        self.widget.color_combo.activated.emit(1)
-        self.widget.color_combo.setCurrentIndex(1)
+        w.color_combo.activated.emit(1)
+        w.color_combo.setCurrentIndex(1)
         self.assertNotEqual(nodes[0].toPlainText(), text)
 
     def test_tree_determinism(self):
         """Check that the tree is drawn identically upon receiving the same
         dataset with no parameter changes."""
+        w = self.widget
         n_tries = 10
 
         def _check_all_same(data):
@@ -62,8 +64,8 @@ def _check_all_same(data):
         # Make sure the tree are deterministic for iris
         scene_nodes = []
         for _ in range(n_tries):
-            self.send_signal(self.signal_name, self.signal_data)
-            scene_nodes.append([n.pos() for n in self.widget.scene.nodes()])
+            self.send_signal(w.Inputs.tree, self.signal_data)
+            scene_nodes.append([n.pos() for n in w.scene.nodes()])
         for node_row in zip(*scene_nodes):
             self.assertTrue(
                 _check_all_same(node_row),
@@ -75,8 +77,8 @@ def _check_all_same(data):
         # the same entropy
         scene_nodes = []
         for _ in range(n_tries):
-            self.send_signal(self.signal_name, self.data_same_entropy)
-            scene_nodes.append([n.pos() for n in self.widget.scene.nodes()])
+            self.send_signal(w.Inputs.tree, self.data_same_entropy)
+            scene_nodes.append([n.pos() for n in w.scene.nodes()])
         for node_row in zip(*scene_nodes):
             self.assertTrue(
                 _check_all_same(node_row),