Addressing review -- Code quality

Author: irgolic

Orange/canvas/canvas/items/linkitem.py

@@ -28,8 +28,6 @@ class LinkCurveItem(QGraphicsPathItem):
     """
     def __init__(self, parent):
         super().__init__(parent)
-        self.__parent = parent
-
         self.setAcceptedMouseButtons(Qt.NoButton)
         self.setAcceptHoverEvents(True)
 
@@ -93,9 +91,6 @@ def setPath(self, path):
         self.__shape = None
         super().setPath(path)
 
-    def parent(self):
-        return self.__parent
-
     def __update(self):
         shadow_enabled = self.__hover
         if self.shadow.isEnabled() != shadow_enabled:

Orange/canvas/document/commands.py

@@ -71,24 +71,13 @@ def undo(self):
         self.scheme.add_link(self.link)
 
 
-class InsertNodeCommand(QUndoCommand):
-    def __init__(self, scheme, link, new_node, parent=None):
+class InsertWidgetIntoLinkCommand(QUndoCommand):
+    def __init__(self, scheme, new_node, old_link, new_links, parent=None):
         QUndoCommand.__init__(self, "Remove link", parent)
         self.scheme = scheme
-        self.original_link = link
         self.inserted_widget = new_node
-
-        possible_links = (self.scheme.propose_links(link.source_node, new_node),
-                          self.scheme.propose_links(new_node, link.sink_node))
-
-        if not possible_links[0] or not possible_links[1]:
-            raise ValueError("Cannot insert widget: links not possible")
-
-        self.new_links = (
-            SchemeLink(link.source_node, link.source_channel,
-                       new_node, possible_links[0][0][1]),  # first link, first entry, output (1)
-            SchemeLink(new_node, possible_links[1][0][0],  # second link, first entry, input (0)
-                       link.sink_node, link.sink_channel))
+        self.original_link = old_link
+        self.new_links = new_links
 
     def redo(self):
         self.scheme.add_node(self.inserted_widget)

Orange/canvas/document/schemeedit.py

@@ -878,11 +878,11 @@ def removeLink(self, link):
         command = commands.RemoveLinkCommand(self.__scheme, link)
         self.__undoStack.push(command)
 
-    def insertNode(self, link, new_node):
+    def insertNodeIntoLink(self, new_node, old_link, new_links):
         """
         Insert a node in-between two linked nodes.
         """
-        command = commands.InsertNodeCommand(self.__scheme, link, new_node)
+        command = commands.InsertWidgetIntoLinkCommand(self.__scheme, new_node, old_link, new_links)
         self.__undoStack.push(command)
 
     def onNewLink(self, func):
@@ -1047,14 +1047,27 @@ def changeEvent(self, event):
 
         QWidget.changeEvent(self, event)
 
-    def tryInsertNode(self, link, new_node_desc, pos):
+    def tryInsertNodeIntoLink(self, link, new_node_desc, pos):
         source_node = link.source_node
         sink_node = link.sink_node
 
         if nodes_are_compatible(source_node.description, new_node_desc) and \
                 nodes_are_compatible(new_node_desc, sink_node.description):
             new_node = self.newNodeHelper(new_node_desc, position=(pos.x(), pos.y()))
-            self.insertNode(link, new_node)
+
+            possible_links = (self.scheme().propose_links(source_node, new_node),
+                              self.scheme().propose_links(new_node, sink_node))
+
+            if not possible_links[0] or not possible_links[1]:
+                raise ValueError("Cannot insert widget: links not possible")
+
+            new_links = (
+                SchemeLink(source_node, link.source_channel,
+                           new_node, possible_links[0][0][1]),  # first link, first entry, output
+                SchemeLink(new_node, possible_links[1][0][0],  # second link, first entry, input
+                           sink_node, link.sink_channel))
+
+            self.insertNodeIntoLink(new_node, link, new_links)
         else:
             self.createNewNode(new_node_desc, position=(pos.x(), pos.y()))
 
@@ -1083,10 +1096,10 @@ def eventFilter(self, obj, event):
                     log.error("Unknown qualified name '%s'", qname)
                 else:
                     pos = event.scenePos()
-                    item = self.__scene.item_at(event.scenePos())
-                    if item and isinstance(item, items.LinkCurveItem):
-                        link = self.__scene.link_for_item(item.parent())
-                        self.tryInsertNode(link, desc, pos)
+                    item = self.__scene.item_at(event.scenePos(), items.LinkItem)
+                    if item:
+                        link = self.__scene.link_for_item(item)
+                        self.tryInsertNodeIntoLink(link, desc, pos)
                     else:
                         self.createNewNode(desc, position=(pos.x(), pos.y()))
                 return True
@@ -1667,7 +1680,19 @@ def filterFunc(index):
         else:
             return
 
-        self.insertNode(original_link, new_node)
+        possible_links = (self.scheme().propose_links(source_node, new_node),
+                          self.scheme().propose_links(new_node, sink_node))
+
+        if not possible_links[0] or not possible_links[1]:
+            raise ValueError("Cannot insert widget: links not possible")
+
+        new_links = (
+            SchemeLink(source_node, original_link.source_channel,
+                       new_node, possible_links[0][0][1]),  # first link, first entry, output
+            SchemeLink(new_node, possible_links[1][0][0],  # second link, first entry, input
+                       sink_node, original_link.sink_channel))
+
+        self.insertNodeIntoLink(new_node, original_link, new_links)
 
     def __duplicateSelected(self):
         """