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

[nodes] imageProcessing: fix outputImages value

Browse source
This commit is contained in:
Enguerrand DE SMET 2020-07-17 10:49:14 +02:00
parent fadb1b472f
commit 67a87a5f09
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
meshroom/nodes/aliceVision/ImageProcessing.py
View file

@ -4,7 +4,24 @@ from meshroom.core import desc
import os.path
def outputImagesValueFunct(attr):
basename = os.path.basename(attr.node.input.value)
fileStem = os.path.splitext(basename)[0]
inputExt = os.path.splitext(basename)[1]
outputExt = ('.' + attr.node.extension.value) if attr.node.extension.value else None
if inputExt in ['.abc', '.sfm']:
return desc.Node.internalFolder + '*' + (outputExt or '.*')
elif inputExt :
return desc.Node.internalFolder + fileStem + (outputExt or inputExt)
else:
if '*' in fileStem:
# Assume the input fileStem is a regular expression to files
return desc.Node.internalFolder + fileStem + (outputExt or '.*')
else:
# No extension mean it is a folder path
return desc.Node.internalFolder + fileStem + '/' + (outputExt or '.*')
class ImageProcessing(desc.CommandLineNode):
commandLine = 'aliceVision_utils_imageProcessing {allParams}'
size = desc.DynamicNodeSize('input')
@ -278,8 +295,9 @@ Convert or apply filtering to the input images.
name='outputImages',
label='Output Images',
description='Output Image Files.',
value=lambda attr: desc.Node.internalFolder + os.path.basename(attr.node.input.value) if (os.path.splitext(attr.node.input.value)[1] not in ['', '.abc', '.sfm']) else (desc.Node.internalFolder + '*.' + (attr.node.extension.value or '*')),
# value=lambda attr: desc.Node.internalFolder + os.path.splitext(attr.node.input.value)[0] + (('.' + attr.node.extension.value) if attr.node.extension.value else os.path.splitext(attr.node.input.value)[1]) if (os.path.splitext(attr.node.input.value)[1] not in ['', '.abc', '.sfm']) else (desc.Node.internalFolder + '*.' + (attr.node.extension.value or '*')),
value= outputImagesValueFunct,
group='', # do not export on the command line
uid=[],
),
]
]