[nodes] KeyframeSelection Add / update options

KeyframeSelection node is now 2.0

meshroom/nodes/aliceVision/KeyframeSelection.py

@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 import os
 from meshroom.core import desc
@@ -8,20 +8,80 @@ class KeyframeSelection(desc.CommandLineNode):
     commandLine = 'aliceVision_utils_keyframeSelection {allParams}'
 
     inputs = [
-        desc.File(
+        desc.ListAttribute(
-            name='mediaPaths',
+            elementDesc=desc.File(
-            label='Media Paths',
+                name="mediaPath",
-            description='''Input video files or image sequence directories.''',
+                label="Media Path",
-            value='',
+                description="Media path.",
+                value="",
                 uid=[0],
             ),
-        desc.IntParam(
+            name='mediaPaths',
-            name='maxNbOutFrame',
+            label='Media Paths',
-            label='Max Nb Out Frame',
+            description='Input video files or image sequence directories.',
-            description='''maximum number of output frames (0 = no limit)''',
+        ),
-            value=1000,
+        desc.ListAttribute(
-            range=(0, 10000, 1),
+            elementDesc=desc.File(
-            uid=[],
+                name="brand",
+                label="Brand",
+                description="Camera brand.",
+                value="",
+                uid=[0],
+            ),
+            name="brands",
+            label="Brands",
+            description="Camera brands."
+        ),
+        desc.ListAttribute(
+            elementDesc=desc.File(
+                name="model",
+                label="Model",
+                description="Camera model.",
+                value="",
+                uid=[0],
+            ),
+            name="models",
+            label="Models",
+            description="Camera models."
+        ),
+        desc.ListAttribute(
+            elementDesc=desc.FloatParam(
+                name="mmFocal",
+                label="mmFocal",
+                description="Focal in mm (will be use if not 0).",
+                value=0.0,
+                range=(0.0, 500.0, 1.0),
+                uid=[0],
+            ),
+            name="mmFocals",
+            label="mmFocals",
+            description="Focals in mm (will be use if not 0)."
+        ),
+        desc.ListAttribute(
+            elementDesc=desc.FloatParam(
+                name="pxFocal",
+                label="pxFocal",
+                description="Focal in px (will be use and convert in mm if not 0).",
+                value=0.0,
+                range=(0.0, 500.0, 1.0),
+                uid=[0],
+            ),
+            name="pxFocals",
+            label="pxFocals",
+            description="Focals in px (will be use and convert in mm if not 0)."
+        ),
+        desc.ListAttribute(
+            elementDesc=desc.IntParam(
+                name="frameOffset",
+                label="Frame Offset",
+                description="Frame offset.",
+                value=0,
+                range=(0, 100.0, 1.0),
+                uid=[0],
+            ),
+            name="frameOffsets",
+            label="Frame Offsets",
+            description="Frame offsets."
         ),
         desc.File(
             name='sensorDbPath',
@@ -37,40 +97,32 @@ class KeyframeSelection(desc.CommandLineNode):
             value=os.environ.get('ALICEVISION_VOCTREE', ''),
             uid=[0],
         ),
-        desc.StringParam(
+        desc.BoolParam(
-            name='brands',
+            name='useSparseDistanceSelection',
-            label='Brands',
+            label='Use Sparse Distance Selection',
-            description='''Camera brands.''',
+            description='Use sparseDistance selection in order to avoid similar keyframes.',
-            value='',
+            value=True,
             uid=[0],
         ),
-        desc.StringParam(
+        desc.BoolParam(
-            name='models',
+            name='useSharpnessSelection',
-            label='Models',
+            label='Use Sharpness Selection',
-            description='''Camera models.''',
+            description='Use frame sharpness score for keyframe selection.',
-            value='',
+            value=True,
             uid=[0],
         ),
         desc.FloatParam(
-            name='mmFocals',
+            name='sparseDistMaxScore',
-            label='Mm Focals',
+            label='Sparse Distance Max Score',
-            description='''Focals in mm (will be use if not 0).''',
+            description='Maximum number of strong common points between two keyframes.',
-            value=0.0,
+            value=100.0,
-            range=(0.0, 500.0, 1.0),
+            range=(1.0, 200.0, 1.0),
-            uid=[0],
-            ),
-        desc.FloatParam(
-            name='pxFocals',
-            label='Px Focals',
-            description='''Focals in px (will be use and convert in mm if not 0).''',
-            value=0.0,
-            range=(0.0, 500.0, 1.0),
             uid=[0],
         ),
         desc.ChoiceParam(
             name='sharpnessPreset',
             label='Sharpness Preset',
-            description='''Preset for sharpnessSelection : {ultra, high, normal, low, very_low, none}''',
+            description='Preset for sharpnessSelection : {ultra, high, normal, low, very_low, none}',
             value='normal',
             values=['ultra', 'high', 'normal', 'low', 'very_low', 'none'],
             exclusive=True,
@@ -100,6 +152,23 @@ class KeyframeSelection(desc.CommandLineNode):
             range=(2, 1000, 1),
             uid=[0],
         ),
+        desc.IntParam(
+            name='maxNbOutFrame',
+            label='Max Nb Out Frame',
+            description='''maximum number of output frames (0 = no limit)''',
+            value=0,
+            range=(0, 10000, 1),
+            uid=[0],
+        ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='verbosity level (fatal, error, warning, info, debug, trace).',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 
     outputs = [