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][node] serialization: rename 'attributes' to 'inputs'

Browse source
This commit is contained in:
Yann Lanthony 2018-07-15 13:38:25 +02:00
parent 33eb7f3a7f
commit 1d309136ec
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meshroom/core/node.py
View file

@ -630,7 +630,7 @@ class Node(BaseNode):
}, },
'uids': self._uids, 'uids': self._uids,
'internalFolder': self._internalFolder, 'internalFolder': self._internalFolder,
'attributes': {k: v for k, v in inputs.items() if v is not None}, # filter empty values 'inputs': {k: v for k, v in inputs.items() if v is not None}, # filter empty values
'outputs': outputs, 'outputs': outputs,
} }

6
meshroom/ui/graph.py
View file

@ -299,9 +299,9 @@ class UIGraph(QObject):
with self.groupedGraphModification("Duplicate Node {}".format(srcNode.name)): with self.groupedGraphModification("Duplicate Node {}".format(srcNode.name)):
# skip edges: filter out attributes which are links # skip edges: filter out attributes which are links
if not createEdges: if not createEdges:
serialized["attributes"] = {k: v for k, v in serialized["attributes"].items() if not Attribute.isLinkExpression(v)} serialized["inputs"] = {k: v for k, v in serialized["inputs"].items() if not Attribute.isLinkExpression(v)}
# create a new node of the same type and with the same attributes values # create a new node of the same type and with the same attributes values
node = self.addNewNode(serialized["nodeType"], **serialized["attributes"]) node = self.addNewNode(serialized["nodeType"], **serialized["inputs"])
return node return node
def duplicateNodesFromNode(self, fromNode): def duplicateNodesFromNode(self, fromNode):
@ -326,7 +326,7 @@ class UIGraph(QObject):
# re-create edges taking into account what has been duplicated # re-create edges taking into account what has been duplicated
for srcNode, duplicate in duplicates.items(): for srcNode, duplicate in duplicates.items():
# get link attributes # get link attributes
links = {k: v for k, v in srcNode.toDict()["attributes"].items() if Attribute.isLinkExpression(v)} links = {k: v for k, v in srcNode.toDict()["inputs"].items() if Attribute.isLinkExpression(v)}
for attr, link in links.items(): for attr, link in links.items():
link = link[1:-1] # remove starting '{' and trailing '}' link = link[1:-1] # remove starting '{' and trailing '}'
# get source node and attribute name # get source node and attribute name

3
meshroom/ui/reconstruction.py
View file

@ -356,7 +356,8 @@ class Reconstruction(UIGraph):
# If cameraInit is None (i.e: SfM augmentation): # If cameraInit is None (i.e: SfM augmentation):
# * create an uninitialized node # * create an uninitialized node
# * wait for the result before actually creating new nodes in the graph (see onIntrinsicsAvailable) # * wait for the result before actually creating new nodes in the graph (see onIntrinsicsAvailable)
cameraInitCopy = node_factory(cameraInit.toDict()) inputs = cameraInit.toDict()["inputs"] if cameraInit else {}
cameraInitCopy = Node("CameraInit", **inputs)
try: try:
self.setBuildingIntrinsics(True) self.setBuildingIntrinsics(True)