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

[nodes] Formatting and small fixes

Browse source
This commit is contained in:
Grégoire De Lillo 2018-06-06 12:04:10 +02:00 • committed by Yann Lanthony
parent 9ce6588b16
commit e27a2145b7
7 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meshroom/nodes/aliceVision/CameraInit.py
View file

@ -63,6 +63,13 @@ class CameraInit(desc.CommandLineNode):
description="Camera Intrinsics", description="Camera Intrinsics",
group="", group="",
), ),
desc.File(
name='sensorDatabase',
label='Sensor Database',
description='''Camera sensor width database path.''',
value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
uid=[],
),
desc.FloatParam( desc.FloatParam(
name='defaultFieldOfView', name='defaultFieldOfView',
label='Default Field Of View', label='Default Field Of View',
@ -71,13 +78,6 @@ class CameraInit(desc.CommandLineNode):
range=(0, 180.0, 1), range=(0, 180.0, 1),
uid=[0], uid=[0],
), ),
desc.File(
name='sensorDatabase',
label='Sensor Database',
description='''Camera sensor width database path.''',
value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
uid=[],
),
desc.ChoiceParam( desc.ChoiceParam(
name='verboseLevel', name='verboseLevel',
label='Verbose Level', label='Verbose Level',
@ -92,7 +92,7 @@ class CameraInit(desc.CommandLineNode):
outputs = [ outputs = [
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output SfMData File',
description='''Output SfMData.''', description='''Output SfMData.''',
value='{cache}/{nodeType}/{uid0}/cameraInit.sfm', value='{cache}/{nodeType}/{uid0}/cameraInit.sfm',
uid=[], uid=[],

8
meshroom/nodes/aliceVision/CameraLocalization.py
View file

@ -212,10 +212,10 @@ class CameraLocalization(desc.CommandLineNode):
uid=[], uid=[],
), ),
desc.File( desc.File(
name='outputBinary', name='outputJSON',
label='Output Binary', label='Output JSON',
description='''Filename for the localization results (raw data) as .bin''', description='''Filename for the localization results as .json''',
value='{cache}/{nodeType}/{uid0}/trackedCameras.bin', value='{cache}/{nodeType}/{uid0}/trackedCameras.json',
uid=[], uid=[],
), ),
] ]

2
meshroom/nodes/aliceVision/ConvertAnimatedCamera.py
View file

@ -20,7 +20,7 @@ class ConvertAnimatedCamera(desc.CommandLineNode):
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output',
description='''Path to the output Alembic file.''', description='Path to the output Alembic file.',
value='{cache}/{nodeType}/{uid0}/animatedCamera.abc', value='{cache}/{nodeType}/{uid0}/animatedCamera.abc',
uid=[], uid=[],
), ),

20
meshroom/nodes/aliceVision/ConvertSfMFormat.py
View file

@ -10,16 +10,16 @@ class ConvertSfMFormat(desc.CommandLineNode):
desc.File( desc.File(
name='input', name='input',
label='Input', label='Input',
description='''SfMData file.''', description='SfMData file.',
value='', value='',
uid=[0], uid=[0],
), ),
desc.ChoiceParam( desc.ChoiceParam(
name='fileExt', name='fileExt',
label='SfM File Format', label='SfM File Format',
description='''SfM File Format''', description='SfM File Format',
value='abc', value='abc',
values=['abc', 'sfm', 'ply', 'bin', 'json'], values=['abc', 'sfm', 'json', 'ply', 'baf'],
exclusive=True, exclusive=True,
uid=[0], uid=[0],
group='', # exclude from command line group='', # exclude from command line
@ -27,42 +27,42 @@ class ConvertSfMFormat(desc.CommandLineNode):
desc.BoolParam( desc.BoolParam(
name='views', name='views',
label='Views', label='Views',
description='''Export views.''', description='Export views.',
value=True, value=True,
uid=[0], uid=[0],
), ),
desc.BoolParam( desc.BoolParam(
name='intrinsics', name='intrinsics',
label='Intrinsics', label='Intrinsics',
description='''Export intrinsics.''', description='Export intrinsics.',
value=True, value=True,
uid=[0], uid=[0],
), ),
desc.BoolParam( desc.BoolParam(
name='extrinsics', name='extrinsics',
label='Extrinsics', label='Extrinsics',
description='''Export extrinsics.''', description='Export extrinsics.',
value=True, value=True,
uid=[0], uid=[0],
), ),
desc.BoolParam( desc.BoolParam(
name='structure', name='structure',
label='Structure', label='Structure',
description='''Export structure.''', description='Export structure.',
value=True, value=True,
uid=[0], uid=[0],
), ),
desc.BoolParam( desc.BoolParam(
name='observations', name='observations',
label='Observations', label='Observations',
description='''Export observations.''', description='Export observations.',
value=True, value=True,
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,
@ -74,7 +74,7 @@ class ConvertSfMFormat(desc.CommandLineNode):
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output',
description='''Path to the output SfM Data file.''', description='Path to the output SfM Data file.',
value='{cache}/{nodeType}/{uid0}/sfm.{fileExtValue}', value='{cache}/{nodeType}/{uid0}/sfm.{fileExtValue}',
uid=[], uid=[],
), ),

10
meshroom/nodes/aliceVision/FeatureExtraction.py
View file

@ -13,7 +13,7 @@ class FeatureExtraction(desc.CommandLineNode):
desc.File( desc.File(
name='input', name='input',
label='Input', label='Input',
description='''SfMData file.''', description='SfMData file.',
value='', value='',
uid=[0], uid=[0],
), ),
@ -39,14 +39,14 @@ class FeatureExtraction(desc.CommandLineNode):
desc.BoolParam( desc.BoolParam(
name='forceCpuExtraction', name='forceCpuExtraction',
label='Force CPU Extraction', label='Force CPU Extraction',
description='''Use only CPU feature extraction.''', description='Use only CPU feature extraction.',
value=True, value=True,
uid=[], uid=[],
), ),
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,
@ -57,8 +57,8 @@ class FeatureExtraction(desc.CommandLineNode):
outputs = [ outputs = [
desc.File( desc.File(
name='output', name='output',
label='Output', label='Output Folder',
description='''Output path for the features and descriptors files (*.feat, *.desc).''', description='Output path for the features and descriptors files (*.feat, *.desc).',
value='{cache}/{nodeType}/{uid0}/', value='{cache}/{nodeType}/{uid0}/',
uid=[], uid=[],
), ),

7
meshroom/nodes/aliceVision/FeatureMatching.py
View file

@ -64,7 +64,7 @@ class FeatureMatching(desc.CommandLineNode):
desc.ChoiceParam( desc.ChoiceParam(
name='geometricEstimator', name='geometricEstimator',
label='Geometric Estimator', label='Geometric Estimator',
description='''Geometric estimator: * acransac: A-Contrario Ransac * loransac: LO-Ransac (only available for fundamental matrix)''', description='Geometric estimator: (acransac: A-Contrario Ransac, loransac: LO-Ransac (only available for "fundamental_matrix" model)',
value='acransac', value='acransac',
values=['acransac', 'loransac'], values=['acransac', 'loransac'],
exclusive=True, exclusive=True,
@ -81,12 +81,13 @@ class FeatureMatching(desc.CommandLineNode):
value=['fundamental_matrix'], value=['fundamental_matrix'],
values=['fundamental_matrix', 'essential_matrix', 'homography_matrix', 'homography_growing'], values=['fundamental_matrix', 'essential_matrix', 'homography_matrix', 'homography_growing'],
exclusive=False, exclusive=False,
uid=[0] uid=[0],
joinChar=',',
), ),
desc.FloatParam( desc.FloatParam(
name='distanceRatio', name='distanceRatio',
label='Distance Ratio', label='Distance Ratio',
description='''Distance ratio to discard non meaningful matches.''', description='Distance ratio to discard non meaningful matches.',
value=0.8, value=0.8,
range=(0.0, 1.0, 0.01), range=(0.0, 1.0, 0.01),
uid=[0], uid=[0],