[nodes] update aliceVision nodes

* remove non-pertinent parameters
* fix parameters types / description
* tweak value ranges
* fix incorrect uids
* update default values

meshroom/nodes/aliceVision/FeatureExtraction.py

@@ -35,11 +35,11 @@ class FeatureExtraction(desc.CommandLineNode):
             exclusive=True,
             uid=[0],
         ),
-        desc.StringParam(
+        desc.BoolParam(
             name='upright',
             label='Upright',
             description='''Upright feature.''',
-            value='',
+            value=False,
             uid=[0],
         ),
         desc.ChoiceParam(
@@ -57,7 +57,7 @@ class FeatureExtraction(desc.CommandLineNode):
         desc.File(
             name='output',
             label='Output',
-            description='''Output path for the features and descriptors files (*.feat, *.desc). Optional parameters:''',
+            description='''Output path for the features and descriptors files (*.feat, *.desc).''',
             value='{cache}/{nodeType}/{uid0}/',
             uid=[],
         ),

meshroom/nodes/aliceVision/FeatureMatching.py

@@ -68,7 +68,7 @@ class FeatureMatching(desc.CommandLineNode):
             exclusive=True,
             uid=[0],
         ),
-        desc.StringParam(
+        desc.BoolParam(
             name='savePutativeMatches',
             label='Save Putative Matches',
             description='''putative matches.''',
@@ -82,11 +82,11 @@ class FeatureMatching(desc.CommandLineNode):
             value=False,
             uid=[0],
         ),
-        desc.File(
+        desc.BoolParam(
             name='matchFilePerImage',
             label='Match File Per Image',
             description='''matches in a separate file per image.''',
-            value='',
+            value=True,
             uid=[0],
         ),
         desc.FloatParam(
@@ -94,16 +94,7 @@ class FeatureMatching(desc.CommandLineNode):
             label='Distance Ratio',
             description='''Distance ratio to discard non meaningful matches.''',
             value=0.8,
-            range=(-float('inf'), float('inf'), 0.01),
-            uid=[0],
-        ),
-        desc.ChoiceParam(
-            name='videoModeMatching',
-            label='Video Mode Matching',
-            description='''sequence matching with an overlap of X images: * 0: will match 0 with (1->X), ... * 2: will match 0 with (1,2), 1 with (2,3), ... * 3: will match 0 with (1,2,3), 1 with (2,3,4), ...''',
-            value=0,
-            values=('0', '2', '3'),
-            exclusive=True,
+            range=(0.0, 1.0, 0.01),
             uid=[0],
         ),
         desc.IntParam(
@@ -111,36 +102,36 @@ class FeatureMatching(desc.CommandLineNode):
             label='Max Iteration',
             description='''Maximum number of iterations allowed in ransac step.''',
             value=2048,
-            range=(0, sys.maxsize, 1),
+            range=(1, 20000, 1),
             uid=[0],
         ),
         desc.BoolParam(
             name='useGridSort',
             label='Use Grid Sort',
             description='''matching grid sort.''',
-            value=False,
+            value=True,
             uid=[0],
         ),
-        desc.File(
+        desc.BoolParam(
             name='exportDebugFiles',
             label='Export Debug Files',
             description='''debug files (svg, dot).''',
-            value='',
-            uid=[0],
+            value=False,
+            uid=[],
         ),
         desc.StringParam(
             name='fileExtension',
             label='File Extension',
             description='''File extension to store matches (bin or txt).''',
-            value='bin',
-            uid=[0],
+            value='txt',
+            uid=[],
         ),
         desc.IntParam(
             name='maxMatches',
             label='Max Matches',
             description='''Maximum number pf matches to keep.''',
             value=0,
-            range=(-sys.maxsize, sys.maxsize, 1),
+            range=(0, 10000, 1),
             uid=[0],
         ),
         desc.ChoiceParam(

meshroom/nodes/aliceVision/ImageMatching.py

@@ -42,7 +42,7 @@ class ImageMatching(desc.CommandLineNode):
             label='Max Descriptors',
             description='''Limit the number of descriptors you load per image. Zero means no limit.''',
             value=500,
-            range=(-sys.maxsize, sys.maxsize, 1),
+            range=(0, 100000, 1),
             uid=[0],
         ),
         desc.IntParam(
@@ -50,13 +50,13 @@ class ImageMatching(desc.CommandLineNode):
             label='Nb Matches',
             description='''The number of matches to retrieve for each image (If 0 it will retrieve all the matches).''',
             value=50,
-            range=(-sys.maxsize, sys.maxsize, 1),
+            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. Log parameters:''',
+            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],
         ),

meshroom/nodes/aliceVision/PrepareDenseScene.py

@@ -30,7 +30,7 @@ class PrepareDenseScene(desc.CommandLineNode):
             value='info',
             values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
             exclusive=True,
-            uid=[0],
+            uid=[],
         ),
     ]
 

meshroom/nodes/aliceVision/StructureFromMotion.py

@@ -40,19 +40,19 @@ class StructureFromMotion(desc.CommandLineNode):
             uid=[0],
             joinChar=',',
         ),
-        desc.File(
+        desc.StringParam(
             name='interFileExtension',
             label='Inter File Extension',
             description='''Extension of the intermediate file export.''',
-            value='.ply',
-            uid=[0],
+            value='.abc',
+            uid=[],
         ),
         desc.IntParam(
             name='minInputTrackLength',
             label='Min Input Track Length',
             description='''Minimum track length in input of SfM''',
             value=2,
-            range=(-sys.maxsize, sys.maxsize, 1),
+            range=(2, 10, 1),
             uid=[0],
         ),
         desc.ChoiceParam(
@@ -60,7 +60,7 @@ class StructureFromMotion(desc.CommandLineNode):
             label='Camera Model',
             description='''* 1: Pinhole * 2: Pinhole radial 1 * 3: Pinhole radial 3''',
             value=3,
-            values=['1', '2', '3'],
+            values=[1, 2, 3],
             exclusive=True,
             uid=[0],
         ),
@@ -78,15 +78,6 @@ class StructureFromMotion(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
-        desc.ChoiceParam(
-            name='refineIntrinsics',
-            label='Refine Intrinsics',
-            description='''intrinsic parameters. Log parameters:''',
-            value=0,
-            values=[0, 1],
-            exclusive=True,
-            uid=[0],
-        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',