Merge pull request #151 from cesioarg/master

Incorporate evaluation logics to BaseNode class + Fix example

Author: jchanvfx

NodeGraphQt/base/node.py

@@ -669,7 +669,7 @@ def output_ports(self):
             list[NodeGraphQt.Port]: node output ports.
         """
         return self._outputs
-    
+
     def input(self, index):
         """
         Return the input port with the matching index.
@@ -775,6 +775,38 @@ def on_input_disconnected(self, in_port, out_port):
         """
         return
 
+    def update_streams(self, *args):
+        """
+        Update all nodes joined by pipes to this.
+        """
+        nodes = []
+        trash = []
+
+        for port, nodeList in self.connected_output_nodes().items():
+            nodes.extend(nodeList)
+
+        while nodes:
+            node = nodes.pop()
+            if node.disabled():
+                continue
+            if node not in trash:
+                trash.append(node)
+
+            for port, nodeList in node.connected_output_nodes().items():
+                nodes.extend(nodeList)
+
+            if not nodes:
+                try:
+                    node.run()
+                except Exception as error:
+                    print("Error Update Streams: %s" % str(error))
+
+    def run(self):
+        """
+        Node evaluation logics.
+        """
+        return
+
 
 class BackdropNode(NodeObject):
     """

example_math_nodes.py

@@ -1,188 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import inspect
-import math
-from functools import partial
-
-# add basic math functions to math library
-math.add = lambda x, y: x + y
-math.sub = lambda x, y: x - y
-math.mul = lambda x, y: x * y
-math.div = lambda x, y: x / y
-
-# Transform float to functions
-for constant in ['pi', 'e', 'tau', 'inf', 'nan']:
-    setattr(math, constant, partial(lambda x: x, getattr(math, constant)))
-
-
+from example_nodes import Nodes
 from NodeGraphQt import (NodeGraph,
                          BaseNode,
                          setup_context_menu)
 from NodeGraphQt import QtWidgets, QtCore, PropertiesBinWidget, NodeTreeWidget
 
 
-def update_streams(node, *args):
-    """
-    Update all nodes joined by pipes
-    """
-    nodes = []
-    trash = []
-
-    for port, nodeList in node.connected_output_nodes().items():
-        nodes.extend(nodeList)
-
-    while nodes:
-        node = nodes.pop()
-        if node not in trash:
-            trash.append(node)
-
-        for port, nodeList in node.connected_output_nodes().items():
-            nodes.extend(nodeList)
-
-        if not nodes:
-            try:
-                node.run()
-            except Exception as error:
-                print("Error Update Streams: %s" % str(error))
-
-
-class DataInputNode(BaseNode):
-    """
-    Input node data.
-    """
-
-    __identifier__ = 'com.chantasticvfx'
-    NODE_NAME = 'Input Numbers'
-
-    def __init__(self):
-        super(DataInputNode, self).__init__()
-        self.output = self.add_output('out')
-        self.add_text_input('out', 'Data Input', text='0.4', tab='widgets')
-        self.view.widgets['out'].value_changed.connect(partial(update_streams, self))
-
-    def run(self):
-        return
-
-
-class MathFunctionsNode(BaseNode):
-    """
-    Math functions node.
-    """
-
-    # set a unique node identifier.
-    __identifier__ = 'com.chantasticvfx'
-
-    # set the initial default node name.
-    NODE_NAME = 'Functions node'
-
-    mathFuncs = [func for func in dir(math) if not func.startswith('_')]
-
-    def __init__(self):
-        super(MathFunctionsNode, self).__init__()
-        self.set_color(25, 58, 51)
-        self.add_combo_menu('functions', 'Functions', items=self.mathFuncs,
-                            tab='widgets')
-
-        # switch math function type
-        self.view.widgets['functions'].value_changed.connect(self.addFunction)
-        update = partial(update_streams, self)
-        self.view.widgets['functions'].value_changed.connect(update)
-        self.output = self.add_output('output')
-        self.create_property(self.output.name(), None)
-        self.trigger_type = 'no_inPorts'
-
-        self.view.widgets['functions'].widget.setCurrentIndex(2)
-
-    def addFunction(self, prop, func):
-        """
-        Create inputs based on math functions arguments.
-        """
-        self.func = getattr(math, func)
-        dataFunc = inspect.getfullargspec(self.func)
-
-        for arg in dataFunc.args:
-            if not self.has_property(arg):
-                inPort = self.add_input(arg)
-                inPort.trigger = True
-                self.create_property(arg, None)
-
-        for inPort in self._inputs:
-            if inPort.name() in dataFunc.args:
-                if not inPort.visible():
-                    inPort.set_visible(True)
-            else:
-                inPort.set_visible(False)
-
-    def run(self):
-        """
-        Evaluate all entries, pass them as arguments of the
-        chosen mathematical function.
-        """
-        for to_port in self.input_ports():
-            if to_port.visible() == False:
-                continue
-            from_ports = to_port.connected_ports()
-            if not from_ports:
-                raise Exception('Port %s not connected!' % to_port.name(),
-                                to_port)
-
-            for from_port in from_ports:
-                from_port.node().run()
-                data = from_port.node().get_property(from_port.name())
-                self.set_property(to_port.name(), float(data))
-
-        try:
-            # Execute math function with arguments.
-            output = self.func(*[self.get_property(inport.name()) for inport in self._inputs if inport.visible()])
-
-            self.set_property('output', output)
-        except KeyError as error:
-            print("An input is missing! %s" % str(error))
-        except TypeError as error:
-            print("Error evaluating function: %s" % str(error))
-
-    def on_input_connected(self, to_port, from_port):
-        """Override node callback method."""
-        self.set_property(to_port.name(), from_port.node().run())
-        update_streams(self)
-
-    def on_input_disconnected(self, to_port, from_port):
-        """Override node callback method."""
-        self.set_property('output', None)
-        update_streams(self)
-
-
-class DataViewerNode(BaseNode):
-    __identifier__ = 'com.chantasticvfx'
-    NODE_NAME = 'Result View'
-
-    def __init__(self):
-        super(DataViewerNode, self).__init__()
-        self.input = self.add_input('in data')
-        self.add_text_input('data', 'Data Viewer', tab='widgets')
-
-    def run(self):
-        """Evaluate input to show it."""
-        for source in self.input.connected_ports():
-            from_node = source.node()
-            try:
-                from_node.run()
-            except Exception as error:
-                print("%s no inputs connected: %s" % (from_node.name(), str(error)))
-                self.set_property('data', None)
-                return
-            value = from_node.get_property(source.name())
-            self.set_property('data', str(value))
-
-    def on_input_connected(self, to_port, from_port):
-        """Override node callback method"""
-        self.run()
-
-    def on_input_disconnected(self, to_port, from_port):
-        """Override node callback method"""
-        self.set_property('data', None)
-
-
 if __name__ == '__main__':
     app = QtWidgets.QApplication([])
 
@@ -216,38 +40,36 @@ def show_nodes_list(node):
     graph.node_double_clicked.connect(show_nodes_list)
 
     # registered nodes.
-    reg_nodes = [DataInputNode, DataViewerNode, MathFunctionsNode]
-
-    for n in reg_nodes:
+    for n in Nodes:
         graph.register_node(n)
 
-    mathNodeA = graph.create_node('com.chantasticvfx.MathFunctionsNode',
+    mathNodeA = graph.create_node('Math.MathFunctionsNode',
                                 name='Math Functions A',
                                 color='#0a1e20',
                                 text_color='#feab20',
                                 pos=[-250, 70])
 
-    mathNodeB = graph.create_node('com.chantasticvfx.MathFunctionsNode',
+    mathNodeB = graph.create_node('Math.MathFunctionsNode',
                                 name='Math Functions B',
                                 color='#0a1e20',
                                 text_color='#feab20',
                                 pos=[-250, -70])
 
-    mathNodeC = graph.create_node('com.chantasticvfx.MathFunctionsNode',
-                                name='Math Functions C',
-                                color='#0a1e20',
-                                text_color='#feab20',
-                                pos=[0, 0])
+    mathNodeC = graph.create_node('Math.MathFunctionsNode',
+                                  name='Math Functions C',
+                                  color='#0a1e20',
+                                  text_color='#feab20',
+                                  pos=[0, 0])
 
-    inputANode = graph.create_node('com.chantasticvfx.DataInputNode',
+    inputANode = graph.create_node('Inputs.DataInputNode',
                                    name='Input A',
                                    pos=[-500, -50])
 
-    inputBNode = graph.create_node('com.chantasticvfx.DataInputNode',
+    inputBNode = graph.create_node('Inputs.DataInputNode',
                                    name='Input B',
                                    pos=[-500, 50])
 
-    outputNode = graph.create_node('com.chantasticvfx.DataViewerNode',
+    outputNode = graph.create_node('Viewers.DataViewerNode',
                                    name='Output',
                                    pos=[250, 0])
 

example_nodes/__init__.py

@@ -1,27 +1,28 @@
 #!/usr/bin/python
-# import os
-# import sys
-#
-# this_path = os.path.dirname(os.path.abspath(__file__))
-# directory = os.listdir(this_path)
-# modules = {}
-# for pkg_file in directory:
-#     pkg, ext = os.path.splitext(pkg_file)
-#     if pkg == '__init__':
-#         continue
-#     if ext in ('.py', '.pyc'):
-#         modules[pkg] = ('from . import {}'.format(pkg))
-#     elif os.path.isdir(os.path.join(directory, pkg_file)):
-#         modules[pkg] = 'from . import {}'.format(pkg)
-#
-# for pkg, pkg_imp in modules.items():
-#     try:
-#         exec pkg_imp
-#     except Exception as e:
-#         import traceback
-#         sys.stderr.write('Can\'t import module: {}'.format(pkg))
-#         info = sys.exc_info()
-#         type = info[0]
-#         param = info[1]
-#         tb = info[2]
-#         traceback.print_exception(type, param, tb, file=sys.stderr)
+import os
+import sys
+import inspect
+import importlib
+
+
+def getNodesRecursively(path=__file__):
+    Nodes = []
+    basedir, filename = os.path.split(path)
+    for root, dirs, files in os.walk(basedir, topdown=False):
+        if root not in sys.path:
+            sys.path.append(root)
+
+        for name in files:
+            if name.endswith('.py') and not name.startswith('_'):
+                module_name = name[:-3]
+                module = importlib.import_module(module_name)
+                for name, obj in inspect.getmembers(module):
+                    if inspect.isclass(obj) and not obj.__name__ == 'BaseNode':
+                        for clsObj in inspect.getmro(obj):
+                            if clsObj.__name__ == 'BaseNode':
+                                Nodes.append(obj)
+                                break
+    return Nodes
+
+
+Nodes = getNodesRecursively()