Merge pull request #248 from jchanvfx/group_node

Group Node / Sub Graph system

Author: jchanvfx

NodeGraphQt/__init__.py

@@ -72,52 +72,45 @@ def __init__(self):
 
         app.exec_()
 """
+from .pkg_info import __version__ as VERSION
+from .pkg_info import __license__ as LICENSE
 
+# node graph
 from .base.graph import NodeGraph, SubGraph
 from .base.menu import NodesMenu, NodeGraphMenu, NodeGraphCommand
-from .base.node import NodeObject, BaseNode, BackdropNode
-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, \
-    topological_sort_by_up, topological_sort_by_down, \
-    update_node_down_stream, update_node_up_stream,\
-    update_nodes_by_up, update_nodes_by_down
+# nodes & ports
+from .base.port import Port
+from .base.node import NodeObject
+from .nodes.base_node import BaseNode
+from .nodes.backdrop_node import BackdropNode
+from .nodes.group_node import GroupNode
 
 # widgets
-from .widgets.nodes_tree import NodeTreeWidget
-from .widgets.nodes_palette import NodesPaletteWidget
-from .widgets.properties_bin import PropertiesBinWidget
-from .widgets.node_publish_widget import NodePublishWidget
 from .widgets.node_widgets import NodeBaseWidget
+from .custom_widgets.nodes_tree import NodesTreeWidget
+from .custom_widgets.nodes_palette import NodesPaletteWidget
+from .custom_widgets.properties_bin import PropertiesBinWidget
 
 
 __version__ = VERSION
 __all__ = [
     'BackdropNode',
     'BaseNode',
+    'GroupNode',
     'LICENSE',
     'NodeBaseWidget',
     'NodeGraph',
     'NodeGraphCommand',
     'NodeGraphMenu',
     'NodeObject',
     'NodesPaletteWidget',
-    'NodeTreeWidget',
+    'NodesTreeWidget',
     'NodesMenu',
     'Port',
     'PropertiesBinWidget',
+    'SubGraph',
     'VERSION',
     'constants',
-    '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',
+    'custom_widgets'
 ]

NodeGraphQt/base/commands.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python
 from Qt import QtWidgets
 
-from .utils import minimize_node_ref_count
-from ..constants import IN_PORT, OUT_PORT
+from NodeGraphQt.constants import IN_PORT, OUT_PORT
 
 
 class PropertyChangedCmd(QtWidgets.QUndoCommand):
@@ -52,29 +51,15 @@ def set_node_prop(self, name, value):
             setattr(view, name, value)
 
     def undo(self):
-        do_undo = False
-        try:
-            if self.old_val != self.new_val:
-                do_undo = True
-        except:
-            do_undo = True
-
-        if do_undo:
+        if self.old_val != self.new_val:
             self.set_node_prop(self.name, self.old_val)
 
             # emit property changed signal.
             graph = self.node.graph
             graph.property_changed.emit(self.node, self.name, self.old_val)
 
     def redo(self):
-        do_redo = False
-        try:
-            if self.old_val != self.new_val:
-                do_redo = True
-        except:
-            do_redo = True
-
-        if do_redo:
+        if self.old_val != self.new_val:
             self.set_node_prop(self.name, self.new_val)
 
             # emit property changed signal.
@@ -126,17 +111,15 @@ 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.delete()
+        self.node.view.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):
@@ -154,19 +137,14 @@ def __init__(self, graph, node):
         self.scene = graph.scene()
         self.model = graph.model
         self.node = node
-        self.node_parent = node.parent()
 
     def undo(self):
         self.model.nodes[self.node.id] = self.node
         self.scene.addItem(self.node.view)
-        self.node.set_parent(self.node_parent)
 
     def redo(self):
         self.model.nodes.pop(self.node.id)
-        self.node.delete()
-
-    def __del__(self):
-        minimize_node_ref_count(self.node)
+        self.node.view.delete()
 
 
 class NodeInputConnectedCmd(QtWidgets.QUndoCommand):

NodeGraphQt/base/factory.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from ..errors import NodeRegistrationError
+from NodeGraphQt.errors import NodeRegistrationError
 
 
 class NodeFactory(object):
@@ -42,24 +42,23 @@ def nodes(self):
         """
         return self.__nodes
 
-    def create_node_instance(self, node_type=None, alias=None):
+    def create_node_instance(self, node_type=None):
         """
         create node object by the node type identifier or alias.
 
         Args:
-            node_type (str): node type.
-            alias (str): alias name (optional).
+            node_type (str): node type or optional alias name.
 
         Returns:
-            NodeGraphQt.BaseNode: new node class object.
+            NodeGraphQt.NodeObject: new node object.
         """
-        if alias and self.aliases.get(alias):
-            node_type = self.aliases[alias]
+        if node_type in self.aliases:
+            node_type = self.aliases[node_type]
 
-        NodeClass = self.__nodes.get(node_type)
-        if not NodeClass:
+        _NodeClass = self.__nodes.get(node_type)
+        if not _NodeClass:
             print('can\'t find node type {}'.format(node_type))
-        return NodeClass
+        return _NodeClass()
 
     def register_node(self, node, alias=None):
         """
@@ -77,9 +76,9 @@ def register_node(self, node, alias=None):
 
         if self.__nodes.get(node_type):
             raise NodeRegistrationError(
-                'id "{}" already registered! '
+                'node type "{}" already registered to "{}"! '
                 'Please specify a new plugin class name or __identifier__.'
-                .format(node_type))
+                .format(node_type, self.__nodes[node_type]))
         self.__nodes[node_type] = node
 
         if self.__names.get(name):