[nodes] FeatureExtraction: expose more options

meshroom/nodes/aliceVision/FeatureExtraction.py

@@ -49,13 +49,57 @@ It is robust to motion-blur, depth-of-field, occlusion. Be careful to have enoug
         ),
         desc.ChoiceParam(
             name='describerPreset',
-            label='Describer Preset',
+            label='Describer Density',
-            description='Control the ImageDescriber configuration (low, medium, normal, high, ultra). Configuration "ultra" can take long time !',
+            description='Control the ImageDescriber density (low, medium, normal, high, ultra).\n'
+                        'Warning: Use ULTRA only on small datasets.',
             value='normal',
             values=['low', 'medium', 'normal', 'high', 'ultra'],
             exclusive=True,
             uid=[0],
         ),
+        desc.ChoiceParam(
+            name='describerQuality',
+            label='Describer Quality',
+            description='Control the ImageDescriber quality (low, medium, normal, high, ultra).',
+            value='normal',
+            values=['low', 'medium', 'normal', 'high', 'ultra'],
+            exclusive=True,
+            uid=[0],
+        ),
+        desc.ChoiceParam(
+            name='contrastFiltering',
+            label='Contrast Filtering',
+            description="Contrast filtering method to ignore features with too low contrast that can be considered as noise:\n"
+                       "* Static: Fixed threshold.\n"
+                       "* AdaptiveToMedianVariance: Based on image content analysis.\n"
+                       "* NoFiltering: Disable contrast filtering.\n"
+                       "* GridSortOctaves: Grid Sort but per octaves (and only per scale at the end).\n"
+                       "* GridSort: Grid sort per octaves and at the end (scale * peakValue).\n"
+                       "* GridSortScaleSteps: Grid sort per octaves and at the end (scale and then peakValue).\n",
+            value='Static',
+            values=['Static', 'AdaptiveToMedianVariance', 'NoFiltering', 'GridSortOctaves', 'GridSort', 'GridSortScaleSteps', 'GridSortOctaveSteps'],
+            exclusive=True,
+            advanced=True,
+            uid=[0],
+        ),
+        desc.FloatParam(
+            name='relativePeakThreshold',
+            label='Relative Peak Threshold',
+            description='Peak Threshold relative to median of gradiants.',
+            value=0.01,
+            range=(0.01, 1.0, 0.001),
+            advanced=True,
+            uid=[0],
+            enabled=lambda node: (node.contrastFiltering.value == 'AdaptiveToMedianVariance'),
+        ),
+        desc.BoolParam(
+            name='gridFiltering',
+            label='Grid Filtering',
+            description='Enable grid filtering. Highly recommended to ensure usable number of features.',
+            value=True,
+            advanced=True,
+            uid=[0],
+        ),
         desc.BoolParam(
             name='forceCpuExtraction',
             label='Force CPU Extraction',
@@ -73,6 +117,23 @@ It is robust to motion-blur, depth-of-field, occlusion. Be careful to have enoug
             uid=[],
             advanced=True,
         ),
+        desc.IntParam(
+            name='invalidate',
+            label='Invalidate',
+            description='Invalidate.',
+            value=0,
+            range=(0, 10000, 1),
+            group="",
+            uid=[0],
+        ),
+        desc.StringParam(
+            name="comments",
+            label="Comments",
+            description="Comments",
+            value="",
+            group="",
+            uid=[],
+        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',