Merge pull request #149 from cesioarg/master

Fix port visibility bug + update math node example

Author: jchanvfx

.gitignore

@@ -1,3 +1,6 @@
+# virtual enviroment
+env/*
+
 # sphinx documentation
 docs/_build/
 api

NodeGraphQt/base/commands.py

@@ -336,7 +336,7 @@ def set_visible(self, visible):
         node_view.post_init()
 
     def undo(self):
-        self.set_visible(self.visible)
-
-    def redo(self):
         self.set_visible(not self.visible)
+        
+    def redo(self):
+        self.set_visible(self.visible)

NodeGraphQt/base/port.py

@@ -104,14 +104,13 @@ def set_visible(self, visible=True):
         Args:
             visible (bool): true if visible.
         """
+        self.model.visible = visible
         label = 'show' if visible else 'hide'
         undo_stack = self.node().graph.undo_stack()
         undo_stack.beginMacro('{} port {}'.format(label, self.name()))
 
-        connected_ports = self.connected_ports()
-        if connected_ports:
-            for port in connected_ports:
-                undo_stack.push(PortDisconnectedCmd(self, port))
+        for port in self.connected_ports():
+            undo_stack.push(PortDisconnectedCmd(self, port))
 
         undo_stack.push(PortVisibleCmd(self))
         undo_stack.endMacro()

example_math_nodes.py

@@ -1,16 +1,28 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 import os
+import math
 import inspect
 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 NodeGraphQt import (NodeGraph,
                          BaseNode,
                          setup_context_menu)
 from NodeGraphQt import QtWidgets, QtCore, PropertiesBinWidget, NodeTreeWidget
 
 
-def update_streams(node):
+def update_streams(node, *args):
     """
     Update all nodes joined by pipes
     """
@@ -46,33 +58,13 @@ class DataInputNode(BaseNode):
     def __init__(self):
         super(DataInputNode, self).__init__()
         self.output = self.add_output('out')
-        self.add_text_input('out', 'Data Input', text='4', tab='widgets')
+        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
 
 
-def add(a, b):
-    return a + b
-
-
-def sub(a, b):
-    return a - b
-
-
-def mul(a, b):
-    return a * b
-
-
-def div(a, b):
-    return a / b
-
-
-# create a dict with all function
-funcs = {'add': add, 'sub': sub, 'mul': mul, 'div': div}
-
-
 class MathFunctionsNode(BaseNode):
     """
     Math functions node.
@@ -85,51 +77,66 @@ class MathFunctionsNode(BaseNode):
     # 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=funcs.keys(), tab='widgets')
+        self.add_combo_menu('functions', 'Functions', items=self.mathFuncs,
+                            tab='widgets')
+
         # switch math function type
         self.view.widgets['functions'].value_changed.connect(self.addFunction)
-        self.set_property('functions', 'add')
-        self.view.widgets['functions'].value_changed.connect(
-            partial(update_streams, self))
+        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 = funcs[func]   # add, sub, mul, div
-
-        dataFunc = inspect.getargspec(self.func)
+        self.func = getattr(math, func)
+        dataFunc = inspect.getfullargspec(self.func)
 
         for arg in dataFunc.args:
             if not self.has_property(arg):
-                self.add_input(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())
+                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(), int(data))
+                self.set_property(to_port.name(), float(data))
 
         try:
             # Execute math function with arguments.
-            output = self.func(*[self.get_property(prop)
-                                 for prop in self.properties()['inputs']])
+            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))
@@ -216,19 +223,19 @@ def show_nodes_list(node):
     for n in reg_nodes:
         graph.register_node(n)
 
-    my_node = graph.create_node('com.chantasticvfx.MathFunctionsNode',
+    mathNodeA = graph.create_node('com.chantasticvfx.MathFunctionsNode',
                                 name='Math Functions A',
                                 color='#0a1e20',
                                 text_color='#feab20',
                                 pos=[-250, 70])
 
-    my_node = graph.create_node('com.chantasticvfx.MathFunctionsNode',
+    mathNodeB = graph.create_node('com.chantasticvfx.MathFunctionsNode',
                                 name='Math Functions B',
                                 color='#0a1e20',
                                 text_color='#feab20',
                                 pos=[-250, -70])
 
-    my_node = graph.create_node('com.chantasticvfx.MathFunctionsNode',
+    mathNodeC = graph.create_node('com.chantasticvfx.MathFunctionsNode',
                                 name='Math Functions C',
                                 color='#0a1e20',
                                 text_color='#feab20',