3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-03 19:31:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

[nodes] Add support for multiple features & matches folders

Browse source
This commit is contained in:
Grégoire De Lillo 2018-06-06 11:55:20 +02:00 • committed by Yann Lanthony
parent b0d8cf208b
commit 236a82ece8
4 changed files with 167 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

67
meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py
View file

@ -13,44 +13,56 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
desc.File(
name='input',
label='Input A',
description='''SfMData file .''',
description='SfMData file .',
value='',
uid=[0],
),
desc.File(
name='inputB',
label='Input B',
description='''SfMData file .''',
description='SfMData file .',
value='',
uid=[0],
),
desc.ListAttribute(
elementDesc=desc.File(
name="featuresFolder",
label="Features Folder",
description="",
value="",
uid=[0],
),
name="featuresFolders",
label="Features Folders",
description="Folder(s) containing the extracted features and descriptors."
),
desc.File(
name='tree',
label='Tree',
description='Input name for the vocabulary tree file.',
value=os.environ.get('ALICEVISION_VOCTREE', ''),
uid=[0],
),
desc.File(
name='weights',
label='Weights',
description='Input name for the weight file, if not provided the weights will be computed on the database built with the provided set.',
value='',
uid=[0],
),
desc.ChoiceParam(
name='modeMultiSfM',
label='Multiple SfM mode',
description='''Image matching multiple SfM mode. "a_ab" for images in input SfMData A plus between A and B. "a_b" for images between input SfMData A and B''',
description='Image matching multiple SfM mode.\n"a_ab" for images in input SfMData A plus between A and B.\n"a_b" for images between input SfMData A and B.',
value='a_ab',
values=['a_ab', 'a_b'],
exclusive=True,
uid=[0],
),
desc.File(
name='featuresFolder',
label='Features Folder',
description='''Folder containing the extracted features and descriptors. By default, it is the folder containing the SfMData.''',
value='',
uid=[0],
),
desc.File(
name='tree',
label='Tree',
description='''Input name for the vocabulary tree file.''',
value=os.environ.get('ALICEVISION_VOCTREE', ''),
uid=[0],
),
desc.IntParam(
name='minNbImages',
label='Minimal Number of Images',
description='''Minimal number of images to use the vocabulary tree. If we have less features than this threshold, we will compute all matching combinations.''',
description='Minimal number of images to use the vocabulary tree. If we have less features than this threshold, we will compute all matching combinations.',
value=200,
range=(0, 500, 1),
uid=[0],
@ -58,7 +70,7 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
desc.IntParam(
name='maxDescriptors',
label='Max Descriptors',
description='''Limit the number of descriptors you load per image. Zero means no limit.''',
description='Limit the number of descriptors you load per image. Zero means no limit.',
value=500,
range=(0, 100000, 1),
uid=[0],
@ -66,22 +78,15 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
desc.IntParam(
name='nbMatches',
label='Nb Matches',
description='''The number of matches to retrieve for each image (If 0 it will retrieve all the matches).''',
description='The number of matches to retrieve for each image (If 0 it will retrieve all the matches).',
value=50,
range=(0, 1000, 1),
uid=[0],
),
desc.File(
name='weights',
label='Weights',
description='''Input name for the weight file, if not provided the weights will be computed on the database built with the provided set.''',
value='',
uid=[0],
),
desc.ChoiceParam(
name='verboseLevel',
label='Verbose Level',
description='''verbosity level (fatal, error, warning, info, debug, trace).''',
description='verbosity level (fatal, error, warning, info, debug, trace).',
value='info',
values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
exclusive=True,
@ -92,15 +97,15 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
outputs = [
desc.File(
name='output',
label='Output',
description='''Filepath to the output file with the list of selected image pairs.''',
label='Output List File',
description='Filepath to the output file with the list of selected image pairs.',
value='{cache}/{nodeType}/{uid0}/imageMatches.txt',
uid=[],
),
desc.File(
name='outputCombinedSfM',
label='Output Combined SfM',
description='''Path for the combined SfMData file''',
description='Path for the combined SfMData file',
value='{cache}/{nodeType}/{uid0}/combineSfM.sfm',
uid=[],
),