From edd14691fcbd9c01b16db6afaf0b4a68a2baf7ad Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Thu, 19 Oct 2017 12:30:05 +0200 Subject: [PATCH] [nodes] use non-exclusive choice for describerTypes param --- meshroom/nodes/aliceVision/FeatureExtraction.py | 11 +++++++---- meshroom/nodes/aliceVision/FeatureMatching.py | 11 +++++++---- meshroom/nodes/aliceVision/StructureFromMotion.py | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/meshroom/nodes/aliceVision/FeatureExtraction.py b/meshroom/nodes/aliceVision/FeatureExtraction.py index db2624d8..aa7cc50e 100644 --- a/meshroom/nodes/aliceVision/FeatureExtraction.py +++ b/meshroom/nodes/aliceVision/FeatureExtraction.py @@ -20,11 +20,14 @@ class FeatureExtraction(desc.CommandLineNode): uid=[], isOutput=True, ) - describerTypes = desc.StringParam( + describerTypes = desc.ChoiceParam( label='Describer Types', - description='''Describer types to use to describe an image:''', - value='SIFT', + description='''Describer types used to describe an image.''', + value=['SIFT'], + values=['SIFT', 'SIFT_FLOAT', 'AKAZE', 'AKAZE_LIOP', 'AKAZE_MLDB', 'CCTAG3', 'CCTAG4', 'SIFT_OCV', 'AKAZE_OCV'], + exclusive=False, uid=[0], + joinChar=',', ) describerPreset = desc.ChoiceParam( label='Describer Preset', @@ -61,4 +64,4 @@ class FeatureExtraction(desc.CommandLineNode): values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'], exclusive=True, uid=[], - ) \ No newline at end of file + ) diff --git a/meshroom/nodes/aliceVision/FeatureMatching.py b/meshroom/nodes/aliceVision/FeatureMatching.py index 9d675a92..c8b94eca 100644 --- a/meshroom/nodes/aliceVision/FeatureMatching.py +++ b/meshroom/nodes/aliceVision/FeatureMatching.py @@ -28,11 +28,14 @@ class FeatureMatching(desc.CommandLineNode): exclusive=True, uid=[0], ) - describerTypes = desc.StringParam( + describerTypes = desc.ChoiceParam( label='Describer Types', - description='''Describer types to use to describe an image:''', - value='SIFT', + description='''Describer types used to describe an image.''', + value=['SIFT'], + values=['SIFT', 'SIFT_FLOAT', 'AKAZE', 'AKAZE_LIOP', 'AKAZE_MLDB', 'CCTAG3', 'CCTAG4', 'SIFT_OCV', 'AKAZE_OCV'], + exclusive=False, uid=[0], + joinChar=',', ) featuresDirectory = desc.File( label='Features Directory', @@ -153,4 +156,4 @@ class FeatureMatching(desc.CommandLineNode): values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'], exclusive=True, uid=[], - ) \ No newline at end of file + ) diff --git a/meshroom/nodes/aliceVision/StructureFromMotion.py b/meshroom/nodes/aliceVision/StructureFromMotion.py index dd1ba2df..d4096ee8 100644 --- a/meshroom/nodes/aliceVision/StructureFromMotion.py +++ b/meshroom/nodes/aliceVision/StructureFromMotion.py @@ -41,11 +41,14 @@ class StructureFromMotion(desc.CommandLineNode): uid=[0], isOutput=False, ) - describerTypes = desc.StringParam( + describerTypes = desc.ChoiceParam( label='Describer Types', - description='''Describer types to use to describe an image:''', - value='SIFT', + description='''Describer types used to describe an image.''', + value=['SIFT'], + values=['SIFT', 'SIFT_FLOAT', 'AKAZE', 'AKAZE_LIOP', 'AKAZE_MLDB', 'CCTAG3', 'CCTAG4', 'SIFT_OCV', 'AKAZE_OCV'], + exclusive=False, uid=[0], + joinChar=',', ) interFileExtension = desc.File( label='Inter File Extension', @@ -98,4 +101,4 @@ class StructureFromMotion(desc.CommandLineNode): values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'], exclusive=True, uid=[], - ) \ No newline at end of file + )