Fix rubber band node select issue.

Author: ArnoChenFx

NodeGraphQt/base/commands.py

@@ -158,10 +158,10 @@ def __init__(self, graph, node):
         self.node_parent = node.parent()
 
         if hasattr(self.node, 'inputs'):
-            input_ports = self.node.inputs().values()
+            input_ports = self.node.input_ports()
             self.inputs = [(p, p.connected_ports()) for p in input_ports]
         if hasattr(self.node, 'outputs'):
-            output_ports = self.node.outputs().values()
+            output_ports = self.node.output_ports()
             self.outputs = [(p, p.connected_ports()) for p in output_ports]
 
     def undo(self):

NodeGraphQt/widgets/viewer.py

@@ -69,6 +69,7 @@ def __init__(self, parent=None):
         self._rubber_band = QtWidgets.QRubberBand(
             QtWidgets.QRubberBand.Rectangle, self
         )
+        self._rubber_band.isActive = False
 
         self._LIVE_PIPE = LivePipe()
         self._LIVE_PIPE.setVisible(False)
@@ -258,11 +259,9 @@ def mousePressEvent(self, event):
             if self.SHIFT_state:
                 for node in nodes:
                     node.selected = not node.selected
-                return
             elif self.CTRL_state:
                 for node in nodes:
                     node.selected = False
-                return
 
         # update the recorded node positions.
         self._node_positions.update(
@@ -276,12 +275,10 @@ def mousePressEvent(self, event):
             map_rect = self.mapToScene(rect).boundingRect()
             self.scene().update(map_rect)
             self._rubber_band.setGeometry(rect)
-            self._rubber_band.show()
+            self._rubber_band.isActive = True
 
-        # allow new live pipe with the shift modifier.
-        # if self.LMB_state:
-        #     if (not self.SHIFT_state and not self.CTRL_state) or\
-        #             (self.SHIFT_state and pipes):
+        if self.LMB_state and (self.SHIFT_state or self.CTRL_state):
+            return
         if not self._LIVE_PIPE.isVisible():
             super(NodeViewer, self).mousePressEvent(event)
 
@@ -301,11 +298,19 @@ def mouseReleaseEvent(self, event):
             self._SLICER_PIPE.setVisible(False)
 
         # hide selection marquee
-        if self._rubber_band.isVisible():
-            rect = self._rubber_band.rect()
-            map_rect = self.mapToScene(rect).boundingRect()
-            self._rubber_band.hide()
-            self.scene().update(map_rect)
+        if self._rubber_band.isActive:
+            self._rubber_band.isActive = False
+            if self._rubber_band.isVisible():
+                rect = self._rubber_band.rect()
+                map_rect = self.mapToScene(rect).boundingRect()
+                self._rubber_band.hide()
+
+                rect = QtCore.QRect(self._origin_pos, event.pos()).normalized()
+                for item in self.scene().items(self.mapToScene(rect).boundingRect()):
+                    if isinstance(item, AbstractNodeItem):
+                        self.node_selected.emit(item.id)
+                        return
+                self.scene().update(map_rect)
 
         # find position changed nodes and emit signal.
         moved_nodes = {
@@ -348,28 +353,32 @@ def mouseMoveEvent(self, event):
             pos_y = (event.y() - self._previous_pos.y())
             self._set_viewer_pan(pos_x, pos_y)
 
-        if self.LMB_state and self._rubber_band.isVisible():
+        if self.LMB_state and self._rubber_band.isActive:
             rect = QtCore.QRect(self._origin_pos, event.pos()).normalized()
-            map_rect = self.mapToScene(rect).boundingRect()
-            path = QtGui.QPainterPath()
-            path.addRect(map_rect)
-            self._rubber_band.setGeometry(rect)
-            self.scene().setSelectionArea(path, QtCore.Qt.IntersectsItemShape)
-            self.scene().update(map_rect)
-
-            if self.SHIFT_state or self.CTRL_state:
-                nodes, pipes = self.selected_items()
-
-                for pipe in self._prev_selection_pipes:
-                    pipe.setSelected(True)
-                for node in self._prev_selection_nodes:
-                    node.selected = True
-
-                if self.CTRL_state:
-                    for pipe in pipes:
-                        pipe.setSelected(False)
-                    for node in nodes:
-                        node.selected = False
+            # if the rubber band is too small, do not show it.
+            if max(rect.width(), rect.height()) > 5:
+                if not self._rubber_band.isVisible():
+                    self._rubber_band.show()
+                map_rect = self.mapToScene(rect).boundingRect()
+                path = QtGui.QPainterPath()
+                path.addRect(map_rect)
+                self._rubber_band.setGeometry(rect)
+                self.scene().setSelectionArea(path, QtCore.Qt.IntersectsItemShape)
+                self.scene().update(map_rect)
+
+                if self.SHIFT_state or self.CTRL_state:
+                    nodes, pipes = self.selected_items()
+
+                    for pipe in self._prev_selection_pipes:
+                        pipe.setSelected(True)
+                    for node in self._prev_selection_nodes:
+                        node.selected = True
+
+                    if self.CTRL_state:
+                        for pipe in pipes:
+                            pipe.setSelected(False)
+                        for node in nodes:
+                            node.selected = False
 
         elif self.LMB_state:
             self.COLLIDING_state = False