Continued implementing macros. Still much to do.

JLuebben · JLuebben · commit 0c20af4df929 · 2016-08-22T16:59:00.000+02:00
diff --git a/floppy/node.py b/floppy/node.py
@@ -499,13 +499,13 @@ def save(self):
             conns = [outputConn['inputNode'].getInputID(outputConn['inputName']) for outputConn in conns]
             outputConns[key] = conns
         return {'class': self.__class__.__name__,
-                     'position': self.__pos__,
-                     'inputs': [(inputName, inp.varType.__name__, inp(True), inp.default)
-                                for inputName, inp in self.inputs.items()],
-                     'inputConnections': inputConns,
-                     'outputs': [(outputName, out.varType.__name__, out.value, out.default)
-                                 for outputName, out in self.outputs.items()],
-                     'outputConnections': outputConns,
+                'position': self.__pos__,
+                'inputs': [(inputName, inp.varType.__name__, inp(True), inp.default)
+                           for inputName, inp in self.inputs.items()],
+                'inputConnections': inputConns,
+                'outputs': [(outputName, out.varType.__name__, out.value, out.default)
+                            for outputName, out in self.outputs.items()],
+                'outputConnections': outputConns,
                 'subgraph': self.subgraph}
 
     @classmethod
@@ -543,6 +543,18 @@ def __init__(self, pinID, info, node):
         self.node = node
 
 
+@abstractNode
+class ProxyNode(Node):
+    """
+    A dummy node without any functionality used as a place holder for subgraphs.
+    """
+
+    def addProxyInput(self, name, output, input, varType):
+        pass
+
+    def addProxyOutput(self, name, output, input, varType):
+        pass
+
 @abstractNode
 class ControlNode(Node):
     """
diff --git a/floppy/painter.py b/floppy/painter.py
@@ -69,7 +69,7 @@ def __init__(self, parent=None):
         self.relayTo = None
         self.selectFrame = None
         self.selectFrame_End = None
-        self.selectedSubgraph = 'main'
+        self.selectedSubgraph = ('main', None)
         self.groupSelection = []
         self.reset()
 
@@ -96,19 +96,32 @@ def reset(self):
         self.relayTo = None
         self.selectFrame = None
         self.selectFrame_End = None
-        self.selectedSubgraph = 'main'
+        self.selectedSubgraph = ('main', None)
         self.groupSelection = []
 
     def createSubgraph(self, name):
         for node in self.groupSelection:
             node.subgraph = name
+        print([i.name for i in self.getAllInputsOfSubgraph(name) if i.connected])
 
-    def setSelectedSubgraph(self, graph):
-        self.selectedSubgraph = graph
+    def setSelectedSubgraph(self, graph, parent=None):
+        if not parent:
+            parent = self.selectedSubgraph[0]
+        self.selectedSubgraph = (graph, parent)
 
     def getAllSubgraphs(self):
         return {node.subgraph for node in self.nodes}
 
+    def getAllInputsOfSubgraph(self, subgraph=None):
+        if not subgraph:
+            subgraph = self.selectedSubgraph[0]
+        inputs = {node.inputs.values() for node in self.nodes if node.subgraph == subgraph}
+        return [j for i in inputs for j in i]
+
+    def getAllOutputsOfSubgraph(self, subgraph=None):
+        if not subgraph:
+            subgraph = self.selectedSubgraph[0]
+        nodes = {node for node in self.nodes if node.subgraph == subgraph}
 
     def checkGraph(self):
         if self.graph.needsUpdate():
@@ -371,7 +384,7 @@ def paintEvent(self, event):
         halfPinSize = PINSIZE//2
 
         for j, node in enumerate(self.nodes):
-            if not self.selectedSubgraph == node.subgraph:
+            if not self.selectedSubgraph[0] == node.subgraph:
                 continue
             j *= 3
             j += 1
