[nodes] imageMatching: rename label and add methods to MultiSfM

alicevision · Jan 31, 2020 · 4afa3c5 · 4afa3c5
1 parent c1cedd5
commit 4afa3c5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/meshroom/nodes/aliceVision/ImageMatching.py b/meshroom/nodes/aliceVision/ImageMatching.py
@@ -39,22 +39,22 @@ class ImageMatching(desc.CommandLineNode):
         ),
         desc.File(
             name='tree',
-            label='Tree',
+            label='Voc Tree: Tree',
             description='Input name for the vocabulary tree file.',
             value=os.environ.get('ALICEVISION_VOCTREE', ''),
             uid=[],
         ),
         desc.File(
             name='weights',
-            label='Weights',
+            label='Voc Tree: 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],
             advanced=True,
         ),
         desc.IntParam(
             name='minNbImages',
-            label='Minimal Number of Images',
+            label='Voc Tree: 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.',
             value=200,
             range=(0, 500, 1),
@@ -63,7 +63,7 @@ class ImageMatching(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='maxDescriptors',
-            label='Max Descriptors',
+            label='Voc Tree: Max Descriptors',
             description='Limit the number of descriptors you load per image. Zero means no limit.',
             value=500,
             range=(0, 100000, 1),
@@ -72,7 +72,7 @@ class ImageMatching(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='nbMatches',
-            label='Nb Matches',
+            label='Voc Tree: Nb 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),
@@ -81,7 +81,7 @@ class ImageMatching(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='nbNeighbors',
-            label='Nb Neighbors',
+            label='Sequential: Nb Neighbors',
             description='The number of neighbors to retrieve for each image (If 0 it will retrieve all the neighbors).',
             value=50,
             range=(0, 1000, 1),

diff --git a/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py b/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py
@@ -36,16 +36,25 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
             label="Features Folders",
             description="Folder(s) containing the extracted features and descriptors."
         ),
+        desc.ChoiceParam(
+            name='method',
+            label='Method',
+            description='Method used to select the image pairs to match.',
+            value='VocabularyTree',
+            values=['VocabularyTree', 'Sequential', 'SequentialAndVocabularyTree','Exhaustive','Frustum'],
+            exclusive=True,
+            uid=[0],
+        ),
         desc.File(
             name='tree',
-            label='Tree',
+            label='Voc Tree: Tree',
             description='Input name for the vocabulary tree file.',
             value=os.environ.get('ALICEVISION_VOCTREE', ''),
             uid=[],
         ),
         desc.File(
             name='weights',
-            label='Weights',
+            label='Voc Tree: 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],
@@ -62,7 +71,7 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='minNbImages',
-            label='Minimal Number of Images',
+            label='Voc Tree: 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.',
             value=200,
             range=(0, 500, 1),
@@ -71,7 +80,7 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='maxDescriptors',
-            label='Max Descriptors',
+            label='Voc Tree: Max Descriptors',
             description='Limit the number of descriptors you load per image. Zero means no limit.',
             value=500,
             range=(0, 100000, 1),
@@ -80,13 +89,22 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
         ),
         desc.IntParam(
             name='nbMatches',
-            label='Nb Matches',
+            label='Voc Tree: Nb 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],
             advanced=True,
         ),
+        desc.IntParam(
+            name='nbNeighbors',
+            label='Sequential: Nb Neighbors',
+            description='The number of neighbors to retrieve for each image (If 0 it will retrieve all the neighbors).',
+            value=50,
+            range=(0, 1000, 1),
+            uid=[0],
+            advanced=True,
+        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',