Revert "sluggish port to qt6 continued. bugs expected..."

This reverts commit b3c4e18.

Author: wilecoyote2015

NodeGraphQt/base/commands.py

@@ -1,11 +1,11 @@
 #!/usr/bin/python
-from qtpy import QtWidgets, QtGui
+from qtpy import QtWidgets
 
 from .utils import minimize_node_ref_count
 from ..constants import IN_PORT, OUT_PORT
 
 
-class PropertyChangedCmd(QtGui.QUndoCommand):
+class PropertyChangedCmd(QtWidgets.QUndoCommand):
     """
     Node property changed command.
 
@@ -16,7 +16,7 @@ class PropertyChangedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, node, name, value):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         if name == 'name':
             self.setText('renamed "{}" to "{}"'.format(node.name(), value))
         else:
@@ -82,7 +82,7 @@ def redo(self):
             graph.property_changed.emit(self.node, self.name, self.new_val)
 
 
-class NodeMovedCmd(QtGui.QUndoCommand):
+class NodeMovedCmd(QtWidgets.QUndoCommand):
     """
     Node moved command.
 
@@ -93,7 +93,7 @@ class NodeMovedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, node, pos, prev_pos):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.node = node
         self.pos = pos
         self.prev_pos = prev_pos
@@ -109,7 +109,7 @@ def redo(self):
         self.node.model.pos = self.pos
 
 
-class NodeAddedCmd(QtGui.QUndoCommand):
+class NodeAddedCmd(QtWidgets.QUndoCommand):
     """
     Node added command.
 
@@ -120,7 +120,7 @@ class NodeAddedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, graph, node, pos=None):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('added node')
         self.viewer = graph.viewer()
         self.model = graph.model
@@ -139,7 +139,7 @@ def redo(self):
         self.node.set_parent(self.node_parent)
 
 
-class NodeRemovedCmd(QtGui.QUndoCommand):
+class NodeRemovedCmd(QtWidgets.QUndoCommand):
     """
     Node deleted command.
 
@@ -149,7 +149,7 @@ class NodeRemovedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, graph, node):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('deleted node')
         self.scene = graph.scene()
         self.model = graph.model
@@ -169,7 +169,7 @@ def __del__(self):
         minimize_node_ref_count(self.node)
 
 
-class NodeInputConnectedCmd(QtGui.QUndoCommand):
+class NodeInputConnectedCmd(QtWidgets.QUndoCommand):
     """
     "BaseNode.on_input_connected()" command.
 
@@ -179,7 +179,7 @@ class NodeInputConnectedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         if src_port.type_() == IN_PORT:
             self.source = src_port
             self.target = trg_port
@@ -196,7 +196,7 @@ def redo(self):
         node.on_input_connected(self.source, self.target)
 
 
-class NodeInputDisconnectedCmd(QtGui.QUndoCommand):
+class NodeInputDisconnectedCmd(QtWidgets.QUndoCommand):
     """
     Node "on_input_disconnected()" command.
 
@@ -206,7 +206,7 @@ class NodeInputDisconnectedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         if src_port.type_() == IN_PORT:
             self.source = src_port
             self.target = trg_port
@@ -223,7 +223,7 @@ def redo(self):
         node.on_input_disconnected(self.source, self.target)
 
 
-class PortConnectedCmd(QtGui.QUndoCommand):
+class PortConnectedCmd(QtWidgets.QUndoCommand):
     """
     Port connected command.
 
@@ -233,7 +233,7 @@ class PortConnectedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.source = src_port
         self.target = trg_port
 
@@ -269,7 +269,7 @@ def redo(self):
         self.source.view.connect_to(self.target.view)
 
 
-class PortDisconnectedCmd(QtGui.QUndoCommand):
+class PortDisconnectedCmd(QtWidgets.QUndoCommand):
     """
     Port disconnected command.
 
@@ -279,7 +279,7 @@ class PortDisconnectedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.source = src_port
         self.target = trg_port
 
@@ -315,7 +315,7 @@ def redo(self):
         self.source.view.disconnect_from(self.target.view)
 
 
-class PortLockedCmd(QtGui.QUndoCommand):
+class PortLockedCmd(QtWidgets.QUndoCommand):
     """
     Port locked command.
 
@@ -324,7 +324,7 @@ class PortLockedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('lock port "{}"'.format(port.name()))
         self.port = port
 
@@ -337,7 +337,7 @@ def redo(self):
         self.port.view.locked = True
 
 
-class PortUnlockedCmd(QtGui.QUndoCommand):
+class PortUnlockedCmd(QtWidgets.QUndoCommand):
     """
     Port unlocked command.
 
@@ -346,7 +346,7 @@ class PortUnlockedCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('unlock port "{}"'.format(port.name()))
         self.port = port
 
@@ -359,7 +359,7 @@ def redo(self):
         self.port.view.locked = False
 
 
-class PortVisibleCmd(QtGui.QUndoCommand):
+class PortVisibleCmd(QtWidgets.QUndoCommand):
     """
     Port visibility command.
 
@@ -368,7 +368,7 @@ class PortVisibleCmd(QtGui.QUndoCommand):
     """
 
     def __init__(self, port):
-        QtGui.QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.port = port
         self.visible = port.visible()
 

NodeGraphQt/base/graph.py

@@ -119,7 +119,7 @@ def __init__(self, parent=None):
         self._model = NodeGraphModel()
         self._viewer = NodeViewer()
         self._node_factory = NodeFactory()
-        self._undo_stack = QtGui.QUndoStack(self)
+        self._undo_stack = QtWidgets.QUndoStack(self)
         self._current_node_space = None
         self._editable = True
 
@@ -601,7 +601,7 @@ def undo_stack(self):
             :meth:`NodeGraph.end_undo()`
 
         Returns:
-            QtGui.QUndoStack: undo stack.
+            QtWidgets.QUndoStack: undo stack.
         """
         return self._undo_stack
 

NodeGraphQt/widgets/viewer.py

@@ -92,7 +92,7 @@ def __init__(self, parent=None):
         self._SLICER_PIPE.setVisible(False)
         self.scene().addItem(self._SLICER_PIPE)
 
-        self._undo_stack = QtWidgets.QUndoView(self)
+        self._undo_stack = QtWidgets.QUndoStack(self)
         self._search_widget = TabSearchMenuWidget()
         self._search_widget.search_submitted.connect(self._on_search_submitted)
 
@@ -267,8 +267,8 @@ def mousePressEvent(self, event):
         elif event.button() == QtCore.Qt.MiddleButton:
             self.MMB_state = True
 
-        self._origin_pos = event.position().toPoint()
-        self._previous_pos = event.position().toPoint()
+        self._origin_pos = event.pos()
+        self._previous_pos = event.pos()
         (self._prev_selection_nodes,
          self._prev_selection_pipes) = self.selected_items()
 
@@ -277,7 +277,7 @@ def mousePressEvent(self, event):
             self.tab_search_toggle()
 
         # cursor pos.
-        map_pos = self.mapToScene(event.position().toPoint())
+        map_pos = self.mapToScene(event.pos())
 
         # pipe slicer enabled.
         slicer_mode = all([self.ALT_state, self.SHIFT_state, self.LMB_state])
@@ -348,7 +348,7 @@ def mouseReleaseEvent(self, event):
                 map_rect = self.mapToScene(rect).boundingRect()
                 self._rubber_band.hide()
 
-                rect = QtCore.QRect(self._origin_pos, event.position().toPoint()).normalized()
+                rect = QtCore.QRect(self._origin_pos, event.pos()).normalized()
                 rect_items = self.scene().items(
                     self.mapToScene(rect).boundingRect()
                 )
@@ -401,21 +401,21 @@ def mouseMoveEvent(self, event):
                 p2 = self.mapToScene(self._previous_pos)
                 self._SLICER_PIPE.draw_path(p1, p2)
                 self._SLICER_PIPE.show()
-            self._previous_pos = event.position().toPoint()
+            self._previous_pos = event.pos()
             super(NodeViewer, self).mouseMoveEvent(event)
             return
 
         if self.MMB_state and self.ALT_state:
-            pos_x = (event.position().x() - self._previous_pos.x())
+            pos_x = (event.x() - self._previous_pos.x())
             zoom = 0.1 if pos_x > 0 else -0.1
-            self._set_viewer_zoom(zoom, 0.05, pos=event.position().toPoint())
+            self._set_viewer_zoom(zoom, 0.05, pos=event.pos())
         elif self.MMB_state or (self.LMB_state and self.ALT_state):
-            pos_x = (event.position().x() - self._previous_pos.x())
-            pos_y = (event.position().y() - self._previous_pos.y())
+            pos_x = (event.x() - self._previous_pos.x())
+            pos_y = (event.y() - self._previous_pos.y())
             self._set_viewer_pan(pos_x, pos_y)
 
         if self.LMB_state and self._rubber_band.isActive:
-            rect = QtCore.QRect(self._origin_pos, event.position().toPoint()).normalized()
+            rect = QtCore.QRect(self._origin_pos, event.pos()).normalized()
             # if the rubber band is too small, do not show it.
             if max(rect.width(), rect.height()) > 5:
                 if not self._rubber_band.isVisible():
@@ -425,7 +425,7 @@ def mouseMoveEvent(self, event):
                 path.addRect(map_rect)
                 self._rubber_band.setGeometry(rect)
                 self.scene().setSelectionArea(
-                    path
+                    path, QtCore.Qt.IntersectsItemShape
                 )
                 self.scene().update(map_rect)
 
@@ -467,7 +467,7 @@ def mouseMoveEvent(self, event):
                             self.COLLIDING_state = True
                             break
 
-        self._previous_pos = event.position().toPoint()
+        self._previous_pos = event.pos()
         super(NodeViewer, self).mouseMoveEvent(event)
 
     def wheelEvent(self, event):
@@ -478,10 +478,10 @@ def wheelEvent(self, event):
             delta = event.angleDelta().y()
             if delta == 0:
                 delta = event.angleDelta().x()
-        self._set_viewer_zoom(delta, pos=event.position().toPoint())
+        self._set_viewer_zoom(delta, pos=event.pos())
 
     def dropEvent(self, event):
-        pos = self.mapToScene(event.position().toPoint())
+        pos = self.mapToScene(event.pos())
         event.setDropAction(QtCore.Qt.CopyAction)
         self.data_dropped.emit(
             event.mimeData(), QtCore.QPoint(pos.x(), pos.y()))
@@ -553,7 +553,7 @@ def sceneMouseMoveEvent(self, event):
         if not self._start_port:
             return
 
-        pos = QtCore.QPointF(event.scenePos())
+        pos = event.scenePos()
         items = self.scene().items(pos)
         if items and isinstance(items[0], PortItem):
             x = items[0].boundingRect().width() / 2
@@ -586,7 +586,7 @@ def sceneMousePressEvent(self, event):
             self.apply_live_connection(event)
             return
 
-        pos = event.scenePos().toPoint()
+        pos = event.scenePos()
         items = self._items_near(pos, None, 5, 5)
 
         # filter from the selection stack in the following order