node factory class clean up

Author: jchanvfx

NodeGraphQt/base/factory.py

@@ -50,15 +50,15 @@ def create_node_instance(self, node_type=None):
             node_type (str): node type or optional alias name.
 
         Returns:
-            NodeGraphQt.NodeObject: new node class object.
+            NodeGraphQt.NodeObject: new node object.
         """
         if node_type in self.aliases:
             node_type = self.aliases[node_type]
 
         _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):
         """

NodeGraphQt/base/graph.py

@@ -887,10 +887,8 @@ def create_node(self, node_type, name=None, selected=True, color=None,
         Returns:
             NodeObject: the created instance of the node.
         """
-        _NodeCls = self._node_factory.create_node_instance(node_type)
-        if _NodeCls:
-            node = _NodeCls()
-
+        node = self._node_factory.create_node_instance(node_type)
+        if node:
             node._graph = self
             node.model._graph_model = self.model
 
@@ -1297,9 +1295,8 @@ def _deserialize(self, data, relative_pos=False, pos=None):
         nodes = {}
         for n_id, n_data in data.get('nodes', {}).items():
             identifier = n_data['type_']
-            _NodeCls = self._node_factory.create_node_instance(identifier)
-            if _NodeCls:
-                node = _NodeCls()
+            node = self._node_factory.create_node_instance(identifier)
+            if node:
                 node.NODE_NAME = n_data.get('name', node.NODE_NAME)
                 # set properties.
                 for prop in node.model.properties.keys():
@@ -1894,6 +1891,9 @@ class SubGraph(NodeGraph):
     controller for managing the expanded node graph for a group node.
 
     Inherited from: :class:`NodeGraphQt.NodeGraph`
+
+    .. image:: _images/sub_graph.png
+        :width: 70%
     """
 
     def __init__(self, parent=None, node=None, node_factory=None):
@@ -1926,7 +1926,7 @@ def _register_builtin_nodes(self):
         """
         Register the default builtin nodes to the :meth:`NodeGraph.node_factory`
         """
-        self.register_node(PortInputNode, alias='PortInput')
+        return
 
     def _build_port_nodes(self):
         """
@@ -2011,11 +2011,10 @@ def _deserialize(self, data, relative_pos=False, pos=None):
                 nodes[n_id].set_pos(*(n_data.get('pos') or [0, 0]))
                 continue
 
-            _NodeCls = self._node_factory.create_node_instance(identifier)
-            if not _NodeCls:
+            node = self._node_factory.create_node_instance(identifier)
+            if not node:
                 continue
 
-            node = _NodeCls()
             node.NODE_NAME = name or node.NODE_NAME
             # set properties.
             for prop in node.model.properties.keys():