diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index 1d632a3d..53671443 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -210,6 +210,7 @@ The metadata needed are: value='.*?(\d+)', uid=[0], advanced=True, + enabled=lambda node: node.viewIdMethod.value == 'filename', ), desc.ChoiceParam( name='verboseLevel', diff --git a/meshroom/nodes/aliceVision/ImageMatching.py b/meshroom/nodes/aliceVision/ImageMatching.py index c117548b..795afae1 100644 --- a/meshroom/nodes/aliceVision/ImageMatching.py +++ b/meshroom/nodes/aliceVision/ImageMatching.py @@ -75,6 +75,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. description='Input name for the vocabulary tree file.', value=os.environ.get('ALICEVISION_VOCTREE', ''), uid=[], + enabled=lambda node: 'VocabularyTree' in node.method.value, ), desc.File( name='weights', @@ -83,6 +84,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. value='', uid=[0], advanced=True, + enabled=lambda node: 'VocabularyTree' in node.method.value, ), desc.IntParam( name='minNbImages', @@ -92,6 +94,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. range=(0, 500, 1), uid=[0], advanced=True, + enabled=lambda node: 'VocabularyTree' in node.method.value, ), desc.IntParam( name='maxDescriptors', @@ -101,6 +104,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. range=(0, 100000, 1), uid=[0], advanced=True, + enabled=lambda node: 'VocabularyTree' in node.method.value, ), desc.IntParam( name='nbMatches', @@ -110,6 +114,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. range=(0, 1000, 1), uid=[0], advanced=True, + enabled=lambda node: 'VocabularyTree' in node.method.value, ), desc.IntParam( name='nbNeighbors', @@ -119,6 +124,7 @@ If images have known poses, use frustum intersection else use VocabularuTree. range=(0, 1000, 1), uid=[0], advanced=True, + enabled=lambda node: 'Sequential' in node.method.value, ), desc.ChoiceParam( name='verboseLevel', diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py index fda72c71..c86b0386 100644 --- a/meshroom/nodes/aliceVision/ImageProcessing.py +++ b/meshroom/nodes/aliceVision/ImageProcessing.py @@ -126,7 +126,7 @@ Convert or apply filtering to the input images. ), desc.GroupAttribute(name="sharpenFilter", label="Sharpen Filter", description="Sharpen Filtering Parameters.", joinChar=":", groupDesc=[ desc.BoolParam( - name='enabled', + name='sharpenFilterEnabled', label='Enable', description='Use sharpen.', value=False, @@ -139,6 +139,7 @@ Convert or apply filtering to the input images. value=3, range=(1, 9, 2), uid=[0], + enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value, ), desc.FloatParam( name='contrast', @@ -147,6 +148,7 @@ Convert or apply filtering to the input images. value=1.0, range=(0.0, 100.0, 0.1), uid=[0], + enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value, ), desc.FloatParam( name='threshold', @@ -155,6 +157,7 @@ Convert or apply filtering to the input images. value=0.0, range=(0.0, 1.0, 0.01), uid=[0], + enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value, ), ]), desc.GroupAttribute(name="bilateralFilter", label="Bilateral Filter", description="Bilateral Filtering Parameters.", joinChar=":", groupDesc=[ @@ -172,6 +175,7 @@ Convert or apply filtering to the input images. value=0, range=(0, 9, 1), uid=[0], + enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value, ), desc.FloatParam( name='bilateralFilterSigmaSpace', @@ -180,6 +184,7 @@ Convert or apply filtering to the input images. value=0.0, range=(0.0, 150.0, 0.01), uid=[0], + enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value, ), desc.FloatParam( name='bilateralFilterSigmaColor', @@ -188,6 +193,7 @@ Convert or apply filtering to the input images. value=0.0, range=(0.0, 150.0, 0.01), uid=[0], + enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value, ), ]), desc.GroupAttribute(name="claheFilter", label="Clahe Filter", description="Clahe Filtering Parameters.", joinChar=":", groupDesc=[ @@ -205,6 +211,7 @@ Convert or apply filtering to the input images. value=4.0, range=(0.0, 8.0, 1.0), uid=[0], + enabled=lambda node: node.claheFilter.claheEnabled.value, ), desc.IntParam( name='claheTileGridSize', @@ -213,6 +220,7 @@ Convert or apply filtering to the input images. value=8, range=(4, 64, 4), uid=[0], + enabled=lambda node: node.claheFilter.claheEnabled.value, ), ]), desc.GroupAttribute(name="noiseFilter", label="Noise Filter", description="Noise Filtering Parameters.", joinChar=":", groupDesc=[ @@ -234,6 +242,7 @@ Convert or apply filtering to the input images. values=['uniform', 'gaussian', 'salt'], exclusive=True, uid=[0], + enabled=lambda node: node.noiseFilter.noiseEnabled.value, ), desc.FloatParam( name='noiseA', @@ -242,6 +251,7 @@ Convert or apply filtering to the input images. value=0.0, range=(0.0, 1.0, 0.0001), uid=[0], + enabled=lambda node: node.noiseFilter.noiseEnabled.value, ), desc.FloatParam( name='noiseB', @@ -250,6 +260,7 @@ Convert or apply filtering to the input images. value=1.0, range=(0.0, 1.0, 0.0001), uid=[0], + enabled=lambda node: node.noiseFilter.noiseEnabled.value, ), desc.BoolParam( name='noiseMono', @@ -257,6 +268,7 @@ Convert or apply filtering to the input images. description='If is Checked, a single noise value will be applied to all channels otherwise a separate noise value will be computed for each channel.', value=True, uid=[0], + enabled=lambda node: node.noiseFilter.noiseEnabled.value, ), ]), desc.ChoiceParam( diff --git a/meshroom/nodes/aliceVision/Meshing.py b/meshroom/nodes/aliceVision/Meshing.py index e46bffbf..f48b71b1 100644 --- a/meshroom/nodes/aliceVision/Meshing.py +++ b/meshroom/nodes/aliceVision/Meshing.py @@ -51,6 +51,7 @@ A Graph Cut Max-Flow is applied to optimally cut the volume. This cut represents range=(0, 100, 1), uid=[0], advanced=True, + enabled=lambda node: node.estimateSpaceFromSfM.value, ), desc.FloatParam( name='estimateSpaceMinObservationAngle', @@ -59,6 +60,7 @@ A Graph Cut Max-Flow is applied to optimally cut the volume. This cut represents value=10, range=(0, 120, 1), uid=[0], + enabled=lambda node: node.estimateSpaceFromSfM.value, ), desc.IntParam( name='maxInputPoints', diff --git a/meshroom/nodes/aliceVision/PanoramaInit.py b/meshroom/nodes/aliceVision/PanoramaInit.py index 9abcdcd8..fcbb4794 100644 --- a/meshroom/nodes/aliceVision/PanoramaInit.py +++ b/meshroom/nodes/aliceVision/PanoramaInit.py @@ -45,7 +45,7 @@ This node allows to setup the Panorama: name='dependency', label='Dependency', description="Folder(s) in which computed features are stored. (WORKAROUND for valid Tractor graph submission)", - group='forDependencyOnly', # not a command line argument + group='forDependencyOnly', # not a command line argument ), desc.BoolParam( name='useFisheye', @@ -60,6 +60,7 @@ This node allows to setup the Panorama: description='Automatically estimate the Fisheye Circle center and radius instead of using user values.', value=True, uid=[0], + enabled=lambda node: node.useFisheye.value, ), desc.GroupAttribute( name="fisheyeCenterOffset", @@ -77,7 +78,8 @@ This node allows to setup the Panorama: uid=[0], range=(-1000.0, 10000.0, 1.0)), ], - group=None, # skip group from command line + group=None, # skip group from command line + enabled=lambda node: node.useFisheye.value and not node.estimateFisheyeCircle.value, ), desc.FloatParam( name='fisheyeRadius', @@ -86,6 +88,7 @@ This node allows to setup the Panorama: value=96.0, range=(0.0, 150.0, 0.01), uid=[0], + enabled=lambda node: node.useFisheye.value and not node.estimateFisheyeCircle.value, ), desc.ChoiceParam( name='verboseLevel',