Merge remote-tracking branch 'upstream/master' into develop

Author: jakubjezek001

NodeGraphQt/__init__.py

@@ -76,10 +76,8 @@ def __init__(self):
 try:
     from Qt import QtWidgets, QtGui, QtCore, QtCompat, QtOpenGL
 except ImportError as ie:
-    from Qt import __version__ as qtpy_ver
-    from Qt import QtWidgets, QtGui, QtCore, QtCompat ,QtOpenGL
-    print('NodeGraphQt: Can\'t import "Qt.py" module falling back on '
-          '"Qt ({})"'.format(qtpy_ver))
+    print('NodeGraphQt: Please install "Qt.py" : pip install Qt.py')
+    raise ImportError(ie)
 
 from .base.graph import NodeGraph, SubGraph
 from .base.menu import NodesMenu, NodeGraphMenu, NodeGraphCommand

NodeGraphQt/base/commands.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
+from Qt import QtWidgets
+
 from .utils import minimize_node_ref_count
-from .. import QtWidgets
 from ..constants import IN_PORT, OUT_PORT
 
 

NodeGraphQt/base/graph.py

@@ -1,11 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+import copy
 import gc
 import json
 import os
 import re
 
-import copy
+from Qt import QtCore, QtWidgets, QtGui
 
 from .commands import (NodeAddedCmd,
                        NodeRemovedCmd,
@@ -16,7 +17,6 @@
 from .model import NodeGraphModel
 from .node import NodeObject, BaseNode
 from .port import Port
-from .. import QtCore, QtWidgets, QtGui
 from ..constants import (DRAG_DROP_ID,
                          PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
@@ -648,7 +648,7 @@ def context_menu(self):
 
         Note:
             This is a convenience function to
-            :meth:`NodeGraphQt.NodeGraph.get_context_menu`
+            :meth:`NodeGraph.get_context_menu`
             with the arg ``menu="graph"``
 
         Returns:
@@ -662,7 +662,7 @@ def context_nodes_menu(self):
 
         Note:
             This is a convenience function to
-            :meth:`NodeGraphQt.NodeGraph.get_context_menu`
+            :meth:`NodeGraph.get_context_menu`
             with the arg ``menu="nodes"``
 
         Returns:
@@ -719,7 +719,7 @@ def acyclic(self):
         Returns true if the current node graph is acyclic.
 
         See Also:
-            :meth:`NodeGraphQt.NodeGraph.set_acyclic`
+            :meth:`NodeGraph.set_acyclic`
 
         Returns:
             bool: true if acyclic (default: ``True``).
@@ -731,7 +731,7 @@ def set_acyclic(self, mode=False):
         Enable the node graph to be a acyclic graph. (default: ``False``)
 
         See Also:
-            :meth:`NodeGraphQt.NodeGraph.acyclic`
+            :meth:`NodeGraph.acyclic`
 
         Args:
             mode (bool): true to enable acyclic.
@@ -1333,6 +1333,11 @@ def serialize_session(self):
         """
         Serializes the current node graph layout to a dictionary.
 
+        See Also:
+            :meth:`NodeGraph.deserialize_session`,
+            :meth:`NodeGraph.save_session`,
+            :meth:`NodeGraph.load_session`
+
         Returns:
             dict: serialized session of the current node layout.
         """
@@ -1342,6 +1347,11 @@ def deserialize_session(self, layout_data):
         """
         Load node graph session from a dictionary object.
 
+        See Also:
+            :meth:`NodeGraph.serialize_session`,
+            :meth:`NodeGraph.load_session`,
+            :meth:`NodeGraph.save_session`
+
         Args:
             layout_data (dict): dictionary object containing a node session.
         """
@@ -1353,6 +1363,11 @@ def save_session(self, file_path):
         """
         Saves the current node graph session layout to a `JSON` formatted file.
 
+        See Also:
+            :meth:`NodeGraph.serialize_session`,
+            :meth:`NodeGraph.deserialize_session`,
+            :meth:`NodeGraph.load_session`,
+
         Args:
             file_path (str): path to the saved node layout.
         """
@@ -1384,6 +1399,11 @@ def load_session(self, file_path):
         """
         Load node graph session layout file.
 
+        See Also:
+            :meth:`NodeGraph.deserialize_session`,
+            :meth:`NodeGraph.serialize_session`,
+            :meth:`NodeGraph.save_session`
+
         Args:
             file_path (str): path to the serialized layout file.
         """
@@ -1429,8 +1449,12 @@ def copy_nodes(self, nodes=None):
         """
         Copy nodes to the clipboard.
 
+        See Also:
+            :meth:`NodeGraph.cut_nodes`
+
         Args:
-            nodes (list[NodeGraphQt.BaseNode]): list of nodes (default: selected nodes).
+            nodes (list[NodeGraphQt.BaseNode]):
+                list of nodes (default: selected nodes).
         """
         nodes = nodes or self.selected_nodes()
         if not nodes:
@@ -1447,8 +1471,12 @@ def cut_nodes(self, nodes=None):
         """
         Cut nodes to the clipboard.
 
+        See Also:
+            :meth:`NodeGraph.copy_nodes`
+
         Args:
-            nodes (list[NodeGraphQt.BaseNode]): list of nodes (default: selected nodes).
+            nodes (list[NodeGraphQt.BaseNode]):
+                list of nodes (default: selected nodes).
         """
         self._undo_stack.beginMacro('cut nodes')
         nodes = nodes or self.selected_nodes()
@@ -1531,7 +1559,7 @@ def question_dialog(self, text, title='Node Graph'):
 
         Note:
             Convenience function to
-            :meth:`NodeGraphQt.NodeGraph.viewer().question_dialog`
+            :meth:`NodeGraph.viewer().question_dialog`
 
         Args:
             text (str): question text.
@@ -1548,7 +1576,7 @@ def message_dialog(self, text, title='Node Graph'):
 
         Note:
             Convenience function to
-            :meth:`NodeGraphQt.NodeGraph.viewer().message_dialog`
+            :meth:`NodeGraph.viewer().message_dialog`
 
         Args:
             text (str): message text.
@@ -1562,7 +1590,7 @@ def load_dialog(self, current_dir=None, ext=None):
 
         Note:
             Convenience function to
-            :meth:`NodeGraphQt.NodeGraph.viewer().load_dialog`
+            :meth:`NodeGraph.viewer().load_dialog`
 
         Args:
             current_dir (str): path to a directory.
@@ -1579,7 +1607,7 @@ def save_dialog(self, current_dir=None, ext=None):
 
         Note:
             Convenience function to
-            :meth:`NodeGraphQt.NodeGraph.viewer().save_dialog`
+            :meth:`NodeGraph.viewer().save_dialog`
 
         Args:
             current_dir (str): path to a directory.

NodeGraphQt/base/menu.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from .. import QtGui, QtCore
+from Qt import QtGui, QtCore
+
 from ..errors import NodeMenuError
 from ..widgets.actions import BaseMenu, GraphAction, NodeAction
 

NodeGraphQt/base/node.py

@@ -1218,6 +1218,15 @@ def auto_size(self):
         """
         self.view.auto_resize()
 
+    def wrap_nodes(self, nodes):
+        """
+        Wrap backdrop size to fit around specified nodes.
+
+        Args:
+            nodes (list[NodeGraphQt.NodeObject]): list of nodes.
+        """
+        self.view.auto_resize([n.view for n in nodes])
+
     def nodes(self):
         """
         Returns nodes wrapped within the backdrop node.

NodeGraphQt/base/port.py

@@ -141,7 +141,7 @@ def lock(self):
         This is the same as calling :meth:`Port.set_locked` with the arg
         set to ``True``
         """
-        self.set_locked(True)
+        self.set_locked(True, connected_ports=True)
 
     def unlock(self):
         """
@@ -151,18 +151,22 @@ def unlock(self):
         This is the same as calling :meth:`Port.set_locked` with the arg
         set to ``False``
         """
-        self.set_locked(False)
+        self.set_locked(False, connected_ports=True)
 
-    def set_locked(self, locked=False):
+    def set_locked(self, state=False, connected_ports=True):
         """
         Sets the port locked state. When locked pipe connections can't be
         connected or disconnected from this port.
 
         Args:
-            locked (Bool): true if locked.
+            state (Bool): port lock state.
+            connected_ports (Bool): apply to lock state to connected ports.
         """
-        self.model.locked = locked
-        self.__view.locked = locked
+        self.model.locked = state
+        self.__view.locked = state
+        if connected_ports:
+            for port in self.connected_ports():
+                port.set_locked(state, connected_ports=False)
 
     def connected_ports(self):
         """

NodeGraphQt/base/utils.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from .. import QtGui, QtCore
+from Qt import QtGui, QtCore
+
 from ..constants import (PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
                          PIPE_LAYOUT_ANGLE,

NodeGraphQt/qgraphics/node_abstract.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from .. import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 
 from ..constants import (Z_VAL_NODE, NODE_WIDTH, NODE_HEIGHT, ITEM_CACHE_MODE)
 

NodeGraphQt/qgraphics/node_backdrop.py

@@ -1,12 +1,12 @@
 #!/usr/bin/python
+from Qt import QtGui, QtCore, QtWidgets
 
-from .. import QtGui, QtCore, QtWidgets
-from ..constants import (Z_VAL_PIPE,
-                         NODE_SEL_COLOR,
-                         NODE_SEL_BORDER_COLOR)
 from .node_abstract import AbstractNodeItem
 from .pipe import Pipe
 from .port import PortItem
+from ..constants import (Z_VAL_PIPE,
+                         NODE_SEL_COLOR,
+                         NODE_SEL_BORDER_COLOR)
 
 
 class BackdropSizer(QtWidgets.QGraphicsItem):