Merge pull request #163 from ArnoChenFx/master

Add Sub Graph System

Author: jchanvfx

NodeGraphQt/__init__.py

@@ -83,17 +83,22 @@ def __init__(self):
 
 from .base.graph import NodeGraph
 from .base.menu import NodesMenu, NodeGraphMenu, NodeGraphCommand
-from .base.node import NodeObject, BaseNode, BackdropNode
+from .base.node import NodeObject, BaseNode, BackdropNode, SubGraph
 from .base.port import Port
 from .pkg_info import __version__ as VERSION
 from .pkg_info import __license__ as LICENSE
 
 # functions
-from .base.utils import setup_context_menu
+from .base.utils import setup_context_menu, \
+    topological_sort_by_up, topological_sort_by_down, \
+    update_node_down_stream, update_node_up_stream,\
+    update_nodes_by_up, update_nodes_by_down
 
 # widgets
 from .widgets.node_tree import NodeTreeWidget
 from .widgets.properties_bin import PropertiesBinWidget
+from .widgets.node_publish_widget import NodePublishWidget
+
 
 __version__ = VERSION
 __all__ = [
@@ -110,6 +115,14 @@ def __init__(self):
     'PropertiesBinWidget',
     'VERSION',
     'constants',
-    'setup_context_menu'
+    'setup_context_menu',
+    'NodePublishWidget',
+    'SubGraph',
+    'topological_sort_by_up',
+    'topological_sort_by_down',
+    'update_node_up_stream',
+    'update_node_down_stream',
+    'update_nodes_by_up',
+    'update_nodes_by_down',
 ]
 

NodeGraphQt/base/commands.py

@@ -125,15 +125,17 @@ def __init__(self, graph, node, pos=None):
         self.model = graph.model
         self.node = node
         self.pos = pos
+        self.node_parent = node.parent()
 
     def undo(self):
         self.pos = self.pos or self.node.pos()
         self.model.nodes.pop(self.node.id)
-        self.node.view.delete()
+        self.node.delete()
 
     def redo(self):
         self.model.nodes[self.node.id] = self.node
         self.viewer.add_node(self.node.view, self.pos)
+        self.node.set_parent(self.node_parent)
 
 
 class NodeRemovedCmd(QtWidgets.QUndoCommand):
@@ -153,6 +155,7 @@ def __init__(self, graph, node):
         self.node = node
         self.inputs = []
         self.outputs = []
+        self.node_parent = node.parent()
 
         if hasattr(self.node, 'inputs'):
             input_ports = self.node.inputs().values()
@@ -164,18 +167,15 @@ def __init__(self, graph, node):
     def undo(self):
         self.model.nodes[self.node.id] = self.node
         self.scene.addItem(self.node.view)
-        for port, connected_ports in self.inputs:
-            [port.connect_to(p) for p in connected_ports]
-        for port, connected_ports in self.outputs:
-            [port.connect_to(p) for p in connected_ports]
+        [port.connect_to(p) for port, connected_ports in self.inputs for p in connected_ports]
+        [port.connect_to(p) for port, connected_ports in self.outputs for p in connected_ports]
+        self.node.set_parent(self.node_parent)
 
     def redo(self):
-        for port, connected_ports in self.inputs:
-            [port.disconnect_from(p) for p in connected_ports]
-        for port, connected_ports in self.outputs:
-            [port.disconnect_from(p) for p in connected_ports]
+        [port.disconnect_from(p) for port, connected_ports in self.inputs for p in connected_ports]
+        [port.disconnect_from(p) for port, connected_ports in self.outputs for p in connected_ports]
         self.model.nodes.pop(self.node.id)
-        self.node.view.delete()
+        self.node.delete()
 
 
 class NodeInputConnectedCmd(QtWidgets.QUndoCommand):