initial support sub graph

Author: ArnoChenFx

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):

NodeGraphQt/base/graph.py

@@ -13,7 +13,7 @@
 from .factory import NodeFactory
 from .menu import NodeGraphMenu, NodesMenu
 from .model import NodeGraphModel
-from .node import NodeObject, BaseNode
+from .node import NodeObject, BaseNode, SubGraph
 from .port import Port
 from ..constants import (DRAG_DROP_ID,
                          PIPE_LAYOUT_CURVED,
@@ -128,11 +128,12 @@ def __init__(self, parent=None):
         self._viewer = NodeViewer()
         self._node_factory = NodeFactory()
         self._undo_stack = QtWidgets.QUndoStack(self)
+        self._current_node_space = None
 
         tab = QtWidgets.QShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Tab), self._viewer)
         tab.activated.connect(self._toggle_tab_search)
         self._viewer.need_show_tab_search.connect(self._toggle_tab_search)
-
+            
         self._wire_signals()
         self.widget.setAcceptDrops(True)
 
@@ -223,6 +224,8 @@ def _on_node_double_clicked(self, node_id):
         """
         node = self.get_node_by_id(node_id)
         self.node_double_clicked.emit(node)
+        if isinstance(node,SubGraph):
+            node.enter()
 
     def _on_node_selected(self, node_id):
         """
@@ -745,6 +748,9 @@ def format_color(clr):
             if pos:
                 node.model.pos = [float(pos[0]), float(pos[1])]
 
+            # set node parent
+            node.set_parent(self._current_node_space)
+
             node.update()
 
             undo_cmd = NodeAddedCmd(self, node, node.model.pos)
@@ -782,6 +788,24 @@ def add_node(self, node, pos=None):
         node.update()
         self._undo_stack.push(NodeAddedCmd(self, node, pos))
 
+    def set_node_space(self, node):
+        """
+        Set the node space of the node graph.
+
+        Args:
+            node (NodeGraphQt.SubGraph): node object.
+        """
+        self._current_node_space = node
+
+    def get_node_space(self):
+        """
+        Get the node space of the node graph.
+
+        Returns:
+            node (NodeGraphQt.SubGraph): node object or None.
+        """
+        return self._current_node_space
+
     def delete_node(self, node):
         """
         Remove the node from the node graph.
@@ -793,6 +817,8 @@ def delete_node(self, node):
             'node must be a instance of a NodeObject.'
         self.nodes_deleted.emit([node.id])
         self._undo_stack.push(NodeRemovedCmd(self, node))
+        if isinstance(node,SubGraph):
+            self.delete_nodes(node.children())
 
     def delete_nodes(self, nodes):
         """
@@ -803,6 +829,7 @@ def delete_nodes(self, nodes):
         """
         self.nodes_deleted.emit([n.id for n in nodes])
         self._undo_stack.beginMacro('delete nodes')
+        [self.delete_nodes(n.children()) for n in nodes if isinstance(n,SubGraph)]
         [self._undo_stack.push(NodeRemovedCmd(self, n)) for n in nodes]
         self._undo_stack.endMacro()
 
@@ -866,7 +893,7 @@ def get_node_by_id(self, node_id=None):
         Returns:
             NodeGraphQt.NodeObject: node object.
         """
-        return self._model.nodes.get(node_id)
+        return self._model.nodes.get(node_id, None)
 
     def get_node_by_name(self, name):
         """
@@ -1009,6 +1036,9 @@ def _deserialize(self, data, relative_pos=False, pos=None):
                 self.add_node(node, n_data.get('pos'))
                 node.set_graph(self)
 
+        # set node parent
+        [node.set_parent_id(node.parent_id) for node in nodes.values()]
+
         # build the connections.
         for connection in data.get('connections', []):
             nid, pname = connection.get('in', ('', ''))
@@ -1064,6 +1094,10 @@ def save_session(self, file_path):
             file_path (str): path to the saved node layout.
         """
         serliazed_data = self._serialize(self.all_nodes())
+        node_space = self.get_node_space()
+        if node_space is not None:
+            node_space = node_space.id
+        serliazed_data['graph'] = {'node_space':node_space,'pipe_layout':self._viewer.get_pipe_layout()}
         file_path = file_path.strip()
         with open(file_path, 'w') as file_out:
             json.dump(serliazed_data, file_out, indent=2, separators=(',', ':'))
@@ -1104,6 +1138,12 @@ def import_session(self, file_path):
             return
 
         self._deserialize(layout_data)
+        node_space_id = layout_data['graph']['node_space']
+        
+        # deserialize graph data
+        self.set_node_space(self.get_node_by_id(node_space_id))
+        self._viewer.set_pipe_layout(layout_data['graph']['pipe_layout'])
+
         self._undo_stack.clear()
         self._model.session = file_path
         self.session_changed.emit(file_path)
@@ -1126,6 +1166,17 @@ def copy_nodes(self, nodes=None):
             return True
         return False
 
+    def cut_nodes(self, nodes=None):
+        """
+        Cut nodes to the clipboard.
+
+        Args:
+            nodes (list[NodeGraphQt.BaseNode]): list of nodes (default: selected nodes).
+        """
+        nodes = nodes or self.selected_nodes()
+        self.copy_nodes(nodes)
+        self.delete_nodes(nodes)
+
     def paste_nodes(self):
         """
         Pastes nodes copied from the clipboard.
@@ -1140,6 +1191,9 @@ def paste_nodes(self):
         self.clear_selection()
         nodes = self._deserialize(serial_data, relative_pos=True)
         [n.set_selected(True) for n in nodes]
+        # set node parent
+        [n.set_parent(self._current_node_space) for n in nodes]
+
         self._undo_stack.endMacro()
 
     def duplicate_nodes(self, nodes):

NodeGraphQt/base/model.py

@@ -58,6 +58,8 @@ def __init__(self):
         self.text_color = (255, 255, 255, 180)
         self.disabled = False
         self.selected = False
+        self.visible = True
+        self.parent_id = None
         self.width = 100.0
         self.height = 80.0
         self.pos = [0.0, 0.0]
@@ -214,10 +216,14 @@ def to_dict(self):
                     'type': 'com.chantasticvfx.FooNode',
                     'selected': False,
                     'disabled': False,
+                    'visible': True,
+                    'parent_id' : None,
                     'inputs': {
                         <port_name>: {<node_id>: [<port_name>, <port_name>]}},
                     'outputs': {
                         <port_name>: {<node_id>: [<port_name>, <port_name>]}},
+                    'input_ports': [<port_name>, <port_name>],
+                    'output_ports': [<port_name>, <port_name>],
                     'width': 0.0,
                     'height: 0.0,
                     'pos': (0.0, 0.0),
@@ -230,11 +236,15 @@ def to_dict(self):
 
         inputs = {}
         outputs = {}
+        input_ports = []
+        output_ports = []
         for name, model in node_dict.pop('inputs').items():
+            input_ports.append(name)
             connected_ports = model.to_dict['connected_ports']
             if connected_ports:
                 inputs[name] = connected_ports
         for name, model in node_dict.pop('outputs').items():
+            output_ports.append(name)
             connected_ports = model.to_dict['connected_ports']
             if connected_ports:
                 outputs[name] = connected_ports
@@ -243,6 +253,9 @@ def to_dict(self):
         if outputs:
             node_dict['outputs'] = outputs
 
+        node_dict['input_ports'] = input_ports
+        node_dict['output_ports'] = output_ports
+
         custom_props = node_dict.pop('_custom_prop', {})
 
         if custom_props: