Fixed an issue with default input values and updating graphs.

JLuebben · JLuebben · commit e725159099f8 · 2016-08-19T16:52:12.000+02:00
diff --git a/floppy/node.py b/floppy/node.py
@@ -58,6 +58,7 @@ def __init__(self, name, varType, hints=None, default='', select=None, owner=Fal
         self.list = list
         self.loopLevel = 0
         self.usedDefault = False
+        self.pure = 0
 
     def setOwner(self, owner):
         self.owner = owner
@@ -126,16 +127,21 @@ def set(self, value, override=False, loopLevel=0):
         if not self.name == 'Control':
             self.loopLevel = loopLevel
 
+    def setPure(self):
+        self.pure = 1
+
     def setConnected(self, value: bool):
         self.connected = value
 
     def isAvailable(self):
         if self.valueSet:
             # print('^^^^^^^^^^^^^^^^^^', self.name, self.value, self.valueSet)
             return True
-        elif self.default != None and not self.connected and not self.usedDefault:
+        elif self.default != None and not self.connected and not self.usedDefault and self.pure < 2:
+            if self.pure == 1:
+                self.pure = 2
             # self.usedDefault = True
-            # print('+++++++++++++++++', self.name, self.value, self.valueSet, self.owner)
+            print('+++++++++++++++++', self.name, self.value, self.valueSet, self.owner, self.usedDefault)
             return True
         return False
 
@@ -275,6 +281,9 @@ def __init__(self, nodeID, graph):
             self.outputBuffer[out.name] = None
         if not self.inputs.keys():
             raise AttributeError('Nodes without any input are not valid.')
+        if len(self.inputs.keys()) == 1:
+            self.inputs[list(self.inputs.keys())[0]].setPure()
+
 
     def __str__(self):
         return '{}-{}'.format(self.__class__.__name__, self.ID)
diff --git a/floppy/painter.py b/floppy/painter.py
@@ -772,13 +772,14 @@ def initMenus(self):
         self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.spawnRunnerAction)
         self.mainToolBar.addAction(self.pushAction)
+        self.mainToolBar.addAction(self.updateRunnerAction)
         self.mainToolBar.addAction(self.killRunnerAction)
         self.mainToolBar.addSeparator()
         # self.mainToolBar.addAction(self.deleteNodeAction)
         self.mainToolBar.addAction(self.connectAction)
         # self.mainToolBar.addAction(self.statusAction)
         self.mainToolBar.addAction(self.dropAction)
-        self.mainToolBar.addAction(self.updateRunnerAction)
+
 
         self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.settingsAction)
