[nodes] SfM: disable userInteraction + disable localBA by default

+ reformat descriptions
This commit is contained in:
Yann Lanthony 2017-11-28 20:48:31 +01:00
parent ce1b416f2d
commit d334b38f50

View file

@ -4,7 +4,7 @@ from meshroom.core import desc
class StructureFromMotion(desc.CommandLineNode): class StructureFromMotion(desc.CommandLineNode):
internalFolder = '{cache}/{nodeType}/{uid0}/' internalFolder = '{cache}/{nodeType}/{uid0}/'
commandLine = 'aliceVision_incrementalSfM {allParams}' commandLine = 'aliceVision_incrementalSfM {allParams} --allowUserInteraction 0'
size = desc.DynamicNodeSize('input') size = desc.DynamicNodeSize('input')
inputs = [ inputs = [
@ -53,9 +53,9 @@ class StructureFromMotion(desc.CommandLineNode):
desc.BoolParam( desc.BoolParam(
name='useLocalBA', name='useLocalBA',
label='Local Bundle Adjustment', label='Local Bundle Adjustment',
description='It reduces the reconstruction time, especially for large datasets (500+ images), ' description='It reduces the reconstruction time, especially for large datasets (500+ images),\n'
'by avoiding computation of the Bundle Adjustment on areas that are not changing.', 'by avoiding computation of the Bundle Adjustment on areas that are not changing.',
value=True, value=False,
uid=[0], uid=[0],
), ),
desc.IntParam( desc.IntParam(
@ -69,7 +69,9 @@ class StructureFromMotion(desc.CommandLineNode):
desc.IntParam( desc.IntParam(
name='maxNumberOfMatches', name='maxNumberOfMatches',
label='Maximum Number of Matches', label='Maximum Number of Matches',
description='Maximum number of matches per image pair (and per feature type). This can be useful to have a quick reconstruction overview. 0 means no limit.', description='Maximum number of matches per image pair (and per feature type). \n'
'This can be useful to have a quick reconstruction overview. \n'
'0 means no limit.',
value=0, value=0,
range=(0, 50000, 1), range=(0, 50000, 1),
uid=[0], uid=[0],
@ -77,7 +79,9 @@ class StructureFromMotion(desc.CommandLineNode):
desc.ChoiceParam( desc.ChoiceParam(
name='cameraModel', name='cameraModel',
label='Camera Model', label='Camera Model',
description='''* 1: Pinhole * 2: Pinhole radial 1 * 3: Pinhole radial 3''', description="1: Pinhole \n"
"2: Pinhole 2\n"
"3: Pinhole 3",
value=3, value=3,
values=[1, 2, 3], values=[1, 2, 3],
exclusive=True, exclusive=True,
@ -86,21 +90,21 @@ class StructureFromMotion(desc.CommandLineNode):
desc.File( desc.File(
name='initialPairA', name='initialPairA',
label='Initial Pair A', label='Initial Pair A',
description='''filename of the first image (without path).''', description='''Filename of the first image (without path).''',
value='', value='',
uid=[0], uid=[0],
), ),
desc.File( desc.File(
name='initialPairB', name='initialPairB',
label='Initial Pair B', label='Initial Pair B',
description='''filename of the second image (without path).''', description='''Filename of the second image (without path).''',
value='', value='',
uid=[0], uid=[0],
), ),
desc.ChoiceParam( desc.ChoiceParam(
name='verboseLevel', name='verboseLevel',
label='Verbose Level', label='Verbose Level',
description='''verbosity level (fatal, error, warning, info, debug, trace).''', description='''Verbosity level (fatal, error, warning, info, debug, trace).''',
value='info', value='info',
values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'], values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
exclusive=True, exclusive=True,