upgrade AutoNode

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -1187,15 +1187,18 @@ def _deserialize(self, data, relative_pos=False, pos=None, set_parent=True):
                 for prop, val in n_data.get('custom', {}).items():
                     node.model.set_property(prop, val)
                 nodes[n_id] = node
-                self.add_node(node, n_data.get('pos'), unique_name=set_parent)
-                node.set_disabled(n_data.get('disabled', False))
+
                 if isinstance(node, SubGraph):
+                    node.create_by_deserialize = True
+                    self.add_node(node, n_data.get('pos'), unique_name=set_parent)
                     published = n_data['custom'].get('published', False)
                     if not published:
                         sub_graph = n_data.get('sub_graph', None)
                         if sub_graph:
                             children = self._deserialize(sub_graph, relative_pos, pos, False)
                             [child.set_parent(node) for child in children]
+                else:
+                    self.add_node(node, n_data.get('pos'), unique_name=set_parent)
 
                 if n_data.get('dynamic_port', None):
                     node.set_ports({'input_ports': n_data['input_ports'], 'output_ports': n_data['output_ports']})

example_auto_nodes/networks/example_SubGraph.json

@@ -101,7 +101,7 @@
           1076.2478051244084,
           1012.9391107053248
         ],
-        "published":false,
+        "published":true,
         "input count":2,
         "output count":1,
         "create_from_select":false,

example_auto_nodes/node_base/auto_node.py

@@ -34,15 +34,15 @@ class AutoNode(BaseNode, QtCore.QObject):
     def __init__(self, defaultInputType=None, defaultOutputType=None):
         super(AutoNode, self).__init__()
         QtCore.QObject.__init__(self)
-        self.needCook = True
-        self._autoCook = True
+        self._needCook = True
         self._error = False
         self.matchTypes = [['float', 'int']]
         self.errorColor = (200, 50, 50)
         self.stopCookColor = (200, 200, 200)
         self._cryptoColors = CryptoColors()
 
-        self.defaultColor = self.get_property("color")
+        self.create_property('autoCook', True)
+        self.create_property('default_color', self.get_property('color'))
         self.defaultValue = None
         self.defaultInputType = defaultInputType
         self.defaultOutputType = defaultOutputType
@@ -56,7 +56,7 @@ def autoCook(self):
         Returns whether the node can update stream automatically.
         """
 
-        return self._autoCook
+        return self.get_property('autoCook')
 
     @autoCook.setter
     def autoCook(self, mode):
@@ -67,14 +67,15 @@ def autoCook(self, mode):
             mode(bool).
         """
 
-        if mode is self._autoCook:
+        if mode is self.autoCook:
             return
 
-        self._autoCook = mode
+        self.model.set_property('autoCook', mode)
         if mode:
-            self.set_property('color', self.defaultColor)
+            self.set_property('color', self.get_property('default_color'))
         else:
-            self.defaultColor = self.get_property("color")
+            if not self.error():
+                self.model.set_property('default_color', self.get_property('color'))
             self.set_property('color', self.stopCookColor)
 
     @property
@@ -86,15 +87,15 @@ def cookTime(self):
         return self._cookTime
 
     @autoCook.setter
-    def cookTime(self, time):
+    def cookTime(self, cook_time):
         """
         Set the last cooked time of the node.
 
         Args:
-            time(float).
+            cook_time(float).
         """
 
-        self._cookTime = time
+        self._cookTime = cook_time
         self._update_tool_tip()
 
     def update_stream(self, forceCook=False):
@@ -106,7 +107,7 @@ def update_stream(self, forceCook=False):
         """
 
         if not forceCook:
-            if not self._autoCook or not self.needCook:
+            if not self.autoCook or not self._needCook:
                 return
             if self.graph is not None and not self.graph.auto_update:
                 return
@@ -155,16 +156,16 @@ def when_disabled(self):
 
         num = max(0, len(self.input_ports())-1)
         for index, out_port in enumerate(self.output_ports()):
-            self.set_property(out_port.name(), self.getInputData(min(index, num)))
+            self.model.set_property(out_port.name(), self.getInputData(min(index, num)))
 
     def cook(self):
         """
         The entry of the node evaluation.
         Most time we need to call this method instead of AutoNode.run'.
         """
 
-        _tmp = self._autoCook
-        self._autoCook = False
+        _tmp = self.autoCook
+        self.model.set_property('autoCook', False)
 
         if self.error():
             self._close_error()
@@ -175,7 +176,7 @@ def cook(self):
         except:
             self.error(traceback.format_exc())
 
-        self._autoCook = _tmp
+        self.model.set_property('autoCook', _tmp)
 
         if self.error():
             return
@@ -195,12 +196,12 @@ def on_input_connected(self, to_port, from_port):
         if self.checkPortType(to_port, from_port):
             self.update_stream()
         else:
-            self.needCook = False
+            self._needCook = False
             to_port.disconnect_from(from_port)
 
     def on_input_disconnected(self, to_port, from_port):
-        if not self.needCook:
-            self.needCook = True
+        if not self._needCook:
+            self._needCook = True
             return
         self.update_stream()
 
@@ -294,21 +295,15 @@ def add_output(self, name='output', data_type='None', multi_output=True, display
 
     def set_disabled(self, mode=False):
         super(AutoNode, self).set_disabled(mode)
-        self._autoCook = not mode
-        if mode:
-            self.when_disabled()
-            if self.graph is None or self.graph.auto_update:
-                self.update_stream()
-        else:
-            self.update_stream()
+        self.update_stream()
 
     def _close_error(self):
         """
         Close the node error.
         """
 
         self._error = False
-        self.set_property('color', self.defaultColor)
+        self.set_property('color', self.get_property('default_color'))
         self._update_tool_tip()
 
     def _show_error(self, message):
@@ -321,7 +316,7 @@ def _show_error(self, message):
         """
 
         if not self._error:
-            self.defaultColor = self.get_property("color")
+            self.model.set_property('default_color', self.get_property('color'))
 
         self._error = True
         self.set_property('color', self.errorColor)
@@ -371,8 +366,4 @@ def error(self, message=None):
 
         self._show_error(message)
 
-    def update_model(self):
-        if self.error():
-            self.set_property('color', self.defaultColor)
-        super(AutoNode, self).update_model()
 

example_auto_nodes/subgraph_nodes.py

@@ -88,6 +88,7 @@ def __init__(self, defaultInputType=None, defaultOutputType=None):
         self.set_property('color', (36, 97, 100, 255))
         self.set_property('published', True)
         self.created = False
+        self.create_by_deserialize = False
 
     def set_graph(self, graph):
         super(Publish, self).set_graph(graph)
@@ -107,19 +108,20 @@ def create_from_file(self):
             return
 
         children_data = data.pop('sub_graph')
-        n_data = data.pop('node')
-
-        n_data.pop('name')
-        # set properties.
-        for prop in self.model.properties.keys():
-            if prop in n_data.keys():
-                self.model.set_property(prop, n_data[prop])
-        # set custom properties.
-        for prop, val in n_data.get('custom', {}).items():
-            self.model.set_property(prop, val)
-
-        if n_data.get('dynamic_port', None):
-            self.set_ports({'input_ports': n_data['input_ports'], 'output_ports': n_data['output_ports']})
+
+        if not self.create_by_deserialize:
+            n_data = data.pop('node')
+            n_data.pop('name')
+            # set properties.
+            for prop in self.model.properties.keys():
+                if prop in n_data.keys():
+                    self.model.set_property(prop, n_data[prop])
+            # set custom properties.
+            for prop, val in n_data.get('custom', {}).items():
+                self.model.set_property(prop, val)
+
+            if n_data.get('dynamic_port', None):
+                self.set_ports({'input_ports': n_data['input_ports'], 'output_ports': n_data['output_ports']})
 
         children = self.graph._deserialize(children_data, set_parent=False)
         [node.set_parent(self) for node in children]