3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-03 03:11:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui.graph] fix node duplication method

Browse source 
* duplicate all nodes before re-creating edges
* add unit test
This commit is contained in:
Yann Lanthony 2018-06-25 16:47:46 +02:00
parent d187a84f5f
commit dbf2649621
2 changed files with 62 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
meshroom/ui/graph.py
View file

@ -304,8 +304,7 @@ class UIGraph(QObject):
node = self.addNewNode(serialized["nodeType"], **serialized["attributes"])
return node
@Slot(Node, result="QVariantList")
def duplicateNodes(self, fromNode):
def duplicateNodesFromNode(self, fromNode):
"""
Duplicate 'fromNode' and all the following nodes towards graph's leaves.
@ -313,30 +312,46 @@ class UIGraph(QObject):
fromNode (Node): the node to start the duplication from
Returns:
[Nodes]: the duplicated nodes
{Nodes: Node}: the source->duplicate nodes map
"""
srcNodes, srcEdges = self._graph.nodesFromNode(fromNode)
srcNodes = srcNodes[1:] # skip fromNode
duplicates = {}
with self.groupedGraphModification("Duplicate {} Nodes".format(len(srcNodes))):
# duplicate the first node with its external edges
duplicates[fromNode.name] = self.duplicateNode(fromNode)
# duplicate all the following nodes and remap their edges internally
# duplicate all nodes without edges and keep a 'source=>duplicate' map
for srcNode in srcNodes:
duplicate = self.duplicateNode(srcNode, createEdges=False)
duplicates[srcNode.name] = duplicate # original node to duplicate map
duplicates[srcNode] = duplicate # original node to duplicate map
# re-create edges taking into account what has been duplicated
for srcNode, duplicate in duplicates.items():
# get link attributes
links = {k: v for k, v in srcNode.toDict()["attributes"].items() if Attribute.isLinkExpression(v)}
for attr, link in links.items():
link = link[1:-1] # remove starting '{' and trailing '}'
# get source node and attribute name
edgeSrcNode, edgeSrcAttrName = link.split(".", 1)
# if the edge's source node has been duplicated, use the duplicate
# otherwise use the original node
edgeSrcNode = duplicates.get(edgeSrcNode, self._graph.node(edgeSrcNode))
edgeSrcNodeName, edgeSrcAttrName = link.split(".", 1)
edgeSrcNode = self._graph.node(edgeSrcNodeName)
# if the edge's source node has been duplicated, use the duplicate; otherwise use the original node
edgeSrcNode = duplicates.get(edgeSrcNode, edgeSrcNode)
self.addEdge(edgeSrcNode.attribute(edgeSrcAttrName), duplicate.attribute(attr))
return duplicates.values()
return duplicates
@Slot(Node, result="QVariantList")
def duplicateNodes(self, fromNode):
"""
Slot accessor to 'duplicateNodesFromNode'. Returns the list of created nodes, usable from QML.
Args:
fromNode (Node): node to start the duplication from
See Also: duplicateNodesFromNode
Returns:
[Nodes]: the list of duplicated nodes
"""
return self.duplicateNodesFromNode(fromNode).values()
@Slot(Attribute, QJsonValue)
def appendAttribute(self, attribute, value=QJsonValue()):