clean up

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -772,7 +772,10 @@ def format_color(clr):
                 node.model.pos = [float(pos[0]), float(pos[1])]
 
             # set node parent
-            node.set_parent(self._current_node_space)
+            if not node.has_property('root'):
+                node.set_parent(self._current_node_space)
+            else:
+                node.set_parent(None)
 
             node.update()
 
@@ -1123,8 +1126,6 @@ def _deserialize(self, data, relative_pos=False, pos=None, set_parent=True):
             if NodeCls:
                 node = NodeCls()
                 node.NODE_NAME = n_data.get('name', node.NODE_NAME)
-                if 'parent_id' in n_data.keys():
-                    n_data.pop('parent_id')
                 # set properties.
                 for prop in node.model.properties.keys():
                     if prop in n_data.keys():
@@ -1257,13 +1258,8 @@ def import_session(self, file_path):
         self._deserialize(layout_data)
 
         if 'graph' in layout_data.keys():
-            # node_space_id = layout_data['graph']['node_space']
-
-            # deserialize graph data
-            # self.set_node_space(self.get_node_by_id(node_space_id))
             self.set_node_space(self.root_node())
             self._viewer.set_pipe_layout(layout_data['graph']['pipe_layout'])
-
             self._viewer.set_scene_rect(layout_data['graph']['graph_rect'])
 
         self.set_node_space(self.root_node())

NodeGraphQt/base/model.py

@@ -60,7 +60,6 @@ def __init__(self):
         self.disabled = False
         self.selected = False
         self.visible = True
-        self.parent_id = None
         self.dynamic_port = False
         self.width = 100.0
         self.height = 80.0
@@ -219,7 +218,6 @@ def to_dict(self):
                     'selected': False,
                     'disabled': False,
                     'visible': True,
-                    'parent_id' : None,
                     'inputs': {
                         <port_name>: {<node_id>: [<port_name>, <port_name>]}},
                     'outputs': {

NodeGraphQt/base/node.py

@@ -58,6 +58,7 @@ def __init__(self, qgraphics_item=None):
         self._view.type_ = self.type_
         self._view.name = self.model.name
         self._view.id = self._model.id
+        self._parent = None
 
     def __repr__(self):
         return '<{}("{}") object at {}>'.format(
@@ -84,26 +85,6 @@ def id(self):
         """
         return self.model.id
 
-    @property
-    def parent_id(self):
-        """
-        The node parent id.
-
-        Returns:
-            str: unique id string.
-        """
-        return self.model.parent_id
-
-    def set_parent_id(self, parent_id=None):
-        """
-        Set node parent id.
-
-        Args:
-            parent_id (str): unique id string.
-        """
-        self.model.parent_id = None
-        self.set_parent(self.graph.get_node_by_id(parent_id))
-
     @property
     def graph(self):
         """
@@ -434,17 +415,15 @@ def set_parent(self, parent_node):
         Args:
             parent_node (SubGraph): parent node.
         """
-        if self.parent_id is not None:
-            parent = self.parent()
-            if parent is not None:
-                parent.remove_child(self)
+        if parent_node is self:
+            parent_node = None
+
+        if self._parent is not None:
+            self._parent.remove_child(self)
 
         if parent_node is not None:
-            self.model.parent_id = parent_node.id
             parent_node.add_child(self)
-        else:
-            self.model.parent_id = None
-
+        self._parent = parent_node
         if self.graph.get_node_space() is not parent_node:
             self.hide()
         else:
@@ -457,7 +436,7 @@ def parent(self):
         Returns:
             SubGraph: parent node or None.
         """
-        return self.graph.get_node_by_id(self.parent_id)
+        return self._parent
 
     def path(self):
         """
@@ -466,20 +445,18 @@ def path(self):
         Returns:
             str: current node path.
         """
-        if self.parent_id is None:
+        if self._parent is None:
             return "/" + self.name()
-
-        return self.parent().path() + "/" + self.name()
+        return self._parent.path() + "/" + self.name()
 
     def delete(self):
         """
         Delete node view.
         """
         self._view.delete()
-        parent = self.parent()
-        if parent is not None:
-            parent.remove_child(self)
-        # self.set_parent_id(None)
+        if self._parent is not None:
+            self._parent.remove_child(self)
+        # self.set_parent(None)
 
     def hide(self):
         """
@@ -925,7 +902,8 @@ def set_ports(self, port_data):
         Set node input and output ports.
 
         Args:
-            port_data(dict): {'input_ports':['port_name', ...], "output_ports":['port_name', ...]}
+            port_data(dict): {'input_ports':[{'name':...,'multi_connection':...,'display_name':...,'data_type':...}, ...],
+            "                 'output_ports':[{'name':...,'multi_connection':...,'display_name':...,'data_type':...}, ...]}
         """
         [self._view.delete_input(port.view) for port in self._inputs]
         [self._view.delete_output(port.view) for port in self._outputs]

example_auto_nodes.py

@@ -56,7 +56,7 @@ def print_path(graph, node):
     print(node.path())
 
 
-def find_node(graph, node):
+def find_node_by_path(graph, node):
     print(graph.get_node_by_path(node.path()))
 
 
@@ -107,14 +107,14 @@ def show_nodes_list(node):
     node_menu.add_command('Cook Node', cook_node, node_class=AutoNode)
     node_menu.add_command('Toggle Auto Cook', toggle_auto_cook, node_class=AutoNode)
     node_menu.add_command('Print Path', print_path, node_class=AutoNode)
-    node_menu.add_command('Find Node', find_node, node_class=AutoNode)
+    node_menu.add_command('Find Node By Path', find_node_by_path, node_class=AutoNode)
 
     # create root node
     graph.create_node('Utility.RootGraph', name='root', selected=False)
 
     # create test nodes
     graph.load_session(r'example_auto_nodes/networks/example_SubGraph.json')
-    graph.get_node_by_path('/root/Vector1').cook()
+    graph.get_node_by_path('/root/SubGraph::Distance').cook()
 
     # widget used for the node graph.
     graph_widget = graph.widget