From 03058f48609a77a0795f4ab0d7ef0c2e3a2b29b0 Mon Sep 17 00:00:00 2001 From: Yann Lanthony Date: Fri, 17 Nov 2017 17:56:33 +0100 Subject: [PATCH] [nodes] turn several parameters into Choices --- meshroom/nodes/aliceVision/FeatureMatching.py | 4 +++- meshroom/nodes/aliceVision/StructureFromMotion.py | 4 +++- meshroom/nodes/aliceVision/Texturing.py | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meshroom/nodes/aliceVision/FeatureMatching.py b/meshroom/nodes/aliceVision/FeatureMatching.py index ef86bbe4..f8303ad3 100644 --- a/meshroom/nodes/aliceVision/FeatureMatching.py +++ b/meshroom/nodes/aliceVision/FeatureMatching.py @@ -119,11 +119,13 @@ class FeatureMatching(desc.CommandLineNode): value=False, uid=[], ), - desc.StringParam( + desc.ChoiceParam( name='fileExtension', label='File Extension', description='''File extension to store matches (bin or txt).''', value='txt', + values=('txt', 'bin'), + exclusive=True, uid=[], ), desc.IntParam( diff --git a/meshroom/nodes/aliceVision/StructureFromMotion.py b/meshroom/nodes/aliceVision/StructureFromMotion.py index 0e38f6d6..76eae744 100644 --- a/meshroom/nodes/aliceVision/StructureFromMotion.py +++ b/meshroom/nodes/aliceVision/StructureFromMotion.py @@ -40,11 +40,13 @@ class StructureFromMotion(desc.CommandLineNode): uid=[0], joinChar=',', ), - desc.StringParam( + desc.ChoiceParam( name='interFileExtension', label='Inter File Extension', description='''Extension of the intermediate file export.''', value='.abc', + values=('.abc', '.ply'), + exclusive=True, uid=[], ), desc.IntParam( diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py index 247da9c5..98aecce5 100644 --- a/meshroom/nodes/aliceVision/Texturing.py +++ b/meshroom/nodes/aliceVision/Texturing.py @@ -22,13 +22,14 @@ class Texturing(desc.CommandLineNode): value='', uid=[0], ), - desc.IntParam( + desc.ChoiceParam( name='textureSide', label='Texture Side', description='''Output texture size''', value=8192, - range=(1024, 16384, 1024), - uid=[0], + values=(1024, 2048, 4096, 8192, 16384), + exclusive=True, + uid=[], ), desc.IntParam( name='padding',