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

Merge develop into dev/nodesAndTaskManager

Browse source
This commit is contained in:
Yann Lanthony 2020-01-24 12:47:07 +01:00
commit 991aca989b
28 changed files with 1570 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/core/node.py
View file

@ -502,6 +502,11 @@ class BaseNode(BaseObject):
for name, attr in self._attributes.objects.items():
if attr.isInput:
continue # skip inputs
# Only consider File attributes for command output parameters
if not isinstance(attr.attributeDesc, desc.File):
continue
attr.value = attr.attributeDesc.value.format(**self._cmdVars)
attr._invalidationValue = attr.attributeDesc.value.format(**cmdVarsNoCache)
v = attr.getValueStr()
@ -599,6 +604,8 @@ class BaseNode(BaseObject):
Args:
cacheDir (str): (optional) override graph's cache directory with custom path
"""
if self.nodeDesc:
self.nodeDesc.update(self)
# Update chunks splitting
self._updateChunks()
# Retrieve current internal folder (if possible)
@ -613,6 +620,8 @@ class BaseNode(BaseObject):
}
self._computeUids()
self._buildCmdVars()
if self.nodeDesc:
self.nodeDesc.postUpdate(self)
# Notify internal folder change if needed
if self.internalFolder != folder:
self.internalFolderChanged.emit()