3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-14 23:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] Simplify checks for displayable outputs

Browse source
This commit is contained in:
Fabien Castan 2025-04-13 12:49:59 +02:00
parent ca75e758be
commit e65dc09710
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
meshroom/core/node.py
View file

@ -1538,7 +1538,9 @@ class BaseNode(BaseObject):
False otherwise.
"""
for attr in self._attributes:
if attr.enabled and attr.isOutput and attr.desc.semantic == "image":
if not attr.enabled or not attr.isOutput:
continue
if attr.desc.semantic == "image":
return True
return False
@ -1548,8 +1550,9 @@ class BaseNode(BaseObject):
False otherwise.
"""
for attr in self._attributes:
if attr.enabled and attr.isOutput and (attr.desc.semantic == "sequence" or
attr.desc.semantic == "imageList"):
if not attr.enabled or not attr.isOutput:
continue
if attr.desc.semantic in ("sequence", "imageList"):
return True
return False
@ -1560,9 +1563,11 @@ class BaseNode(BaseObject):
# List of supported extensions, taken from Viewer3DSettings
supportedExts = ['.obj', '.stl', '.fbx', '.gltf', '.abc', '.ply']
for attr in self._attributes:
if not attr.enabled or not attr.isOutput:
continue
# If the attribute is a File attribute, it is an instance of str and can be iterated over
hasSupportedExt = isinstance(attr.value, str) and any(ext in attr.value for ext in supportedExts)
if attr.enabled and attr.isOutput and hasSupportedExt:
if hasSupportedExt:
return True
return False