[nodes] SfMTransform, SfMTransfer, SfMAlignment expose the same output params than the StructureFromMotion node

This commit is contained in:
Fabien Castan 2020-06-29 13:59:53 +02:00
parent 082f9b5843
commit 21fa9167ae
5 changed files with 39 additions and 12 deletions

View file

@ -169,7 +169,7 @@ Estimate relative camera rotations between input images.
), ),
desc.File( desc.File(
name='outputViewsAndPoses', name='outputViewsAndPoses',
label='Output SfMData File', label='Output Poses',
description='''Path to the output sfmdata file with cameras (views and poses).''', description='''Path to the output sfmdata file with cameras (views and poses).''',
value=desc.Node.internalFolder + 'cameras.sfm', value=desc.Node.internalFolder + 'cameras.sfm',
uid=[], uid=[],

View file

@ -1,7 +1,9 @@
__version__ = "1.0" __version__ = "2.0"
from meshroom.core import desc from meshroom.core import desc
import os.path
class SfMAlignment(desc.CommandLineNode): class SfMAlignment(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmAlignment {allParams}' commandLine = 'aliceVision_utils_sfmAlignment {allParams}'
@ -107,9 +109,16 @@ The alignment can be based on:
outputs = [ outputs = [
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output SfMData File',
description='''Aligned SfMData file .''', description='SfMData file.',
value=desc.Node.internalFolder + 'alignedSfM.abc', value=lambda attr: desc.Node.internalFolder + (os.path.splitext(os.path.basename(attr.node.input.value))[0] or 'sfmData') + '.abc',
uid=[],
),
desc.File(
name='outputViewsAndPoses',
label='Output Poses',
description='''Path to the output sfmdata file with cameras (views and poses).''',
value=desc.Node.internalFolder + 'cameras.sfm',
uid=[], uid=[],
), ),
] ]

View file

@ -1,7 +1,9 @@
__version__ = "1.0" __version__ = "2.0"
from meshroom.core import desc from meshroom.core import desc
import os.path
class SfMTransfer(desc.CommandLineNode): class SfMTransfer(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmTransfer {allParams}' commandLine = 'aliceVision_utils_sfmTransfer {allParams}'
@ -90,9 +92,16 @@ This node allows to transfer poses and/or intrinsics form one SfM scene onto ano
outputs = [ outputs = [
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output SfMData File',
description='SfMData file.', description='SfMData file.',
value=desc.Node.internalFolder + 'sfmData.abc', value=lambda attr: desc.Node.internalFolder + (os.path.splitext(os.path.basename(attr.node.input.value))[0] or 'sfmData') + '.abc',
uid=[],
),
desc.File(
name='outputViewsAndPoses',
label='Output Poses',
description='''Path to the output sfmdata file with cameras (views and poses).''',
value=desc.Node.internalFolder + 'cameras.sfm',
uid=[], uid=[],
), ),
] ]

View file

@ -1,7 +1,9 @@
__version__ = "1.1" __version__ = "2.0"
from meshroom.core import desc from meshroom.core import desc
import os.path
class SfMTransform(desc.CommandLineNode): class SfMTransform(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmTransform {allParams}' commandLine = 'aliceVision_utils_sfmTransform {allParams}'
@ -116,9 +118,16 @@ The transformation can be based on:
outputs = [ outputs = [
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output SfMData File',
description='''Aligned SfMData file .''', description='''Aligned SfMData file .''',
value=desc.Node.internalFolder + 'transformedSfM.abc', value=lambda attr: desc.Node.internalFolder + (os.path.splitext(os.path.basename(attr.node.input.value))[0] or 'sfmData') + '.abc',
uid=[],
),
desc.File(
name='outputViewsAndPoses',
label='Output Poses',
description='''Path to the output sfmdata file with cameras (views and poses).''',
value=desc.Node.internalFolder + 'cameras.sfm',
uid=[], uid=[],
), ),
] ]

View file

@ -334,7 +334,7 @@ It iterates like that, adding cameras and triangulating new 2D features into 3D
), ),
desc.File( desc.File(
name='outputViewsAndPoses', name='outputViewsAndPoses',
label='Output SfMData File', label='Output Poses',
description='''Path to the output sfmdata file with cameras (views and poses).''', description='''Path to the output sfmdata file with cameras (views and poses).''',
value=desc.Node.internalFolder + 'cameras.sfm', value=desc.Node.internalFolder + 'cameras.sfm',
uid=[], uid=[],