3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-04-29 18:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] fix graph file loading

Browse source 
Only resolve attribute expressions (containing edges description) once all nodes have been created
This commit is contained in:
Yann Lanthony 2017-10-23 14:33:42 +02:00
parent 6fa0cba8db
commit 473141ebed
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
meshroom/core/graph.py
View file

@ -566,19 +566,24 @@ class Graph(BaseObject):
if not isinstance(nodeData, dict): if not isinstance(nodeData, dict):
raise RuntimeError('loadGraph error: Node is not a dict. File: {}'.format(filepath)) raise RuntimeError('loadGraph error: Node is not a dict. File: {}'.format(filepath))
n = Node(nodeData['nodeType'], parent=self, **nodeData['attributes']) n = Node(nodeData['nodeType'], parent=self, **nodeData['attributes'])
self.addNode(n, uniqueName=nodeName) # Add node to the graph with raw attributes values
self._addNode(n, nodeName)
# Create graph edges by resolving attributes expressions
self._applyExpr() self._applyExpr()
def addNode(self, node, uniqueName=None): def _addNode(self, node, uniqueName):
"""
Internal method to add the given node to this Graph, with the given name (must be unique).
Attribute expressions are not resolved.
"""
if node.graph is not None and node.graph != self: if node.graph is not None and node.graph != self:
raise RuntimeError( raise RuntimeError(
'Node "{}" cannot be part of the Graph "{}", as it is already part of the other graph "{}".'.format( 'Node "{}" cannot be part of the Graph "{}", as it is already part of the other graph "{}".'.format(
node.nodeType, self.name, node.graph.name)) node.nodeType, self.name, node.graph.name))
if uniqueName:
assert uniqueName not in self._nodes.objects assert uniqueName not in self._nodes.keys()
node._name = uniqueName node._name = uniqueName
else:
node._name = self._createUniqueNodeName(node.nodeType)
node.graph = self node.graph = self
self._nodes.add(node) self._nodes.add(node)
self.stopExecutionRequested.connect(node.stopProcess) self.stopExecutionRequested.connect(node.stopProcess)
@ -587,6 +592,13 @@ class Graph(BaseObject):
for attr in node.attributes: # type: Attribute for attr in node.attributes: # type: Attribute
attr.valueChanged.connect(self.updateInternals) attr.valueChanged.connect(self.updateInternals)
def addNode(self, node, uniqueName=None):
"""
Add the given node to this Graph with an optional unique name,
and resolve attributes expressions.
"""
self._addNode(node, uniqueName if uniqueName else self._createUniqueNodeName(node.nodeType))
# Resolve attribute expressions
node._applyExpr() node._applyExpr()
return node return node