diff --git a/meshroom/nodes/aliceVision/PanoramaCompositing.py b/meshroom/nodes/aliceVision/PanoramaCompositing.py index 11c8d7dc..a7f284b4 100644 --- a/meshroom/nodes/aliceVision/PanoramaCompositing.py +++ b/meshroom/nodes/aliceVision/PanoramaCompositing.py @@ -63,15 +63,6 @@ Multiple cameras are contributing to the low frequencies and only the best one c exclusive=True, uid=[0], ), - desc.File( - name='customCacheFolder', - label='Cache Folder', - description="Temporary cache directory", - value='', - uid=[0], - group='', - advanced=True, - ), desc.ChoiceParam( name='verboseLevel', label='Verbose Level', @@ -90,12 +81,5 @@ Multiple cameras are contributing to the low frequencies and only the best one c description='', value=desc.Node.internalFolder, uid=[], - ), - desc.File( - name='cacheFolder', - label='Cache Folder', - description='Temporary cache directory', - value=lambda attr: attr.node.customCacheFolder.value if attr.node.customCacheFolder.value else (desc.Node.internalFolder + 'cache/'), - uid=[], - ), + ) ] diff --git a/meshroom/nodes/aliceVision/PanoramaMerging.py b/meshroom/nodes/aliceVision/PanoramaMerging.py new file mode 100644 index 00000000..4be405dd --- /dev/null +++ b/meshroom/nodes/aliceVision/PanoramaMerging.py @@ -0,0 +1,75 @@ +__version__ = "1.0" + +import json +import os + +from meshroom.core import desc + + +class PanoramaMerging(desc.CommandLineNode): + commandLine = 'aliceVision_panoramaMerging {allParams}' + size = desc.DynamicNodeSize('input') + + + documentation = ''' +Merge all inputs coming from PanoramaComposiring +''' + + inputs = [ + desc.File( + name='input', + label='Input SfMData', + description="Input SfMData.", + value='', + uid=[0], + ), + desc.File( + name='compositingFolder', + label='compositing Folder', + description="Panorama Compositing results", + value='', + uid=[0], + ), + desc.ChoiceParam( + name='outputFileType', + label='Output File Type', + description='Output file type for the undistorted images.', + value='exr', + values=['jpg', 'png', 'tif', 'exr'], + exclusive=True, + uid=[0], + group='', # not part of allParams, as this is not a parameter for the command line + ), + desc.ChoiceParam( + name='storageDataType', + label='Storage Data Type', + description='Storage image data type:\n' + ' * float: Use full floating point (32 bits per channel)\n' + ' * half: Use half float (16 bits per channel)\n' + ' * halfFinite: Use half float, but clamp values to avoid non-finite values\n' + ' * auto: Use half float if all values can fit, else use full float\n', + value='float', + values=['float', 'half', 'halfFinite', 'auto'], + exclusive=True, + uid=[0], + ), + desc.ChoiceParam( + name='verboseLevel', + label='Verbose Level', + description='Verbosity level (fatal, error, warning, info, debug, trace).', + value='info', + values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'], + exclusive=True, + uid=[], + ), + ] + + outputs = [ + desc.File( + name='outputPanorama', + label='Output Folder', + description='', + value=desc.Node.internalFolder + 'panorama.{outputFileTypeValue}', + uid=[], + ), + ]