[nodes] use non-exclusive choice for describerTypes param

This commit is contained in:
Fabien Castan 2017-10-19 12:30:05 +02:00
parent 7ec61b9d6c
commit edd14691fc
3 changed files with 21 additions and 12 deletions

View file

@ -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=[],
)
)

View file

@ -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=[],
)
)

View file

@ -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=[],
)
)