3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-25 06:56:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

[nodes] update several nodes with enabled parameter

Browse source
This commit is contained in:
Julien-Haudegond 2020-07-29 11:38:13 +02:00
parent a5407fc8c7
commit d1756ca650
5 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
meshroom/nodes/aliceVision/CameraInit.py
View file

@ -210,6 +210,7 @@ The metadata needed are:
value='.*?(\d+)', value='.*?(\d+)',
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: node.viewIdMethod.value == 'filename',
), ),
desc.ChoiceParam( desc.ChoiceParam(
name='verboseLevel', name='verboseLevel',

6
meshroom/nodes/aliceVision/ImageMatching.py
View file

@ -75,6 +75,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
description='Input name for the vocabulary tree file.', description='Input name for the vocabulary tree file.',
value=os.environ.get('ALICEVISION_VOCTREE', ''), value=os.environ.get('ALICEVISION_VOCTREE', ''),
uid=[], uid=[],
enabled=lambda node: 'VocabularyTree' in node.method.value,
), ),
desc.File( desc.File(
name='weights', name='weights',
@ -83,6 +84,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
value='', value='',
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: 'VocabularyTree' in node.method.value,
), ),
desc.IntParam( desc.IntParam(
name='minNbImages', name='minNbImages',
@ -92,6 +94,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
range=(0, 500, 1), range=(0, 500, 1),
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: 'VocabularyTree' in node.method.value,
), ),
desc.IntParam( desc.IntParam(
name='maxDescriptors', name='maxDescriptors',
@ -101,6 +104,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
range=(0, 100000, 1), range=(0, 100000, 1),
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: 'VocabularyTree' in node.method.value,
), ),
desc.IntParam( desc.IntParam(
name='nbMatches', name='nbMatches',
@ -110,6 +114,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
range=(0, 1000, 1), range=(0, 1000, 1),
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: 'VocabularyTree' in node.method.value,
), ),
desc.IntParam( desc.IntParam(
name='nbNeighbors', name='nbNeighbors',
@ -119,6 +124,7 @@ If images have known poses, use frustum intersection else use VocabularuTree.
range=(0, 1000, 1), range=(0, 1000, 1),
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: 'Sequential' in node.method.value,
), ),
desc.ChoiceParam( desc.ChoiceParam(
name='verboseLevel', name='verboseLevel',

14
meshroom/nodes/aliceVision/ImageProcessing.py
View file

@ -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.GroupAttribute(name="sharpenFilter", label="Sharpen Filter", description="Sharpen Filtering Parameters.", joinChar=":", groupDesc=[
desc.BoolParam( desc.BoolParam(
name='enabled', name='sharpenFilterEnabled',
label='Enable', label='Enable',
description='Use sharpen.', description='Use sharpen.',
value=False, value=False,
@ -139,6 +139,7 @@ Convert or apply filtering to the input images.
value=3, value=3,
range=(1, 9, 2), range=(1, 9, 2),
uid=[0], uid=[0],
enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='contrast', name='contrast',
@ -147,6 +148,7 @@ Convert or apply filtering to the input images.
value=1.0, value=1.0,
range=(0.0, 100.0, 0.1), range=(0.0, 100.0, 0.1),
uid=[0], uid=[0],
enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='threshold', name='threshold',
@ -155,6 +157,7 @@ Convert or apply filtering to the input images.
value=0.0, value=0.0,
range=(0.0, 1.0, 0.01), range=(0.0, 1.0, 0.01),
uid=[0], uid=[0],
enabled=lambda node: node.sharpenFilter.sharpenFilterEnabled.value,
), ),
]), ]),
desc.GroupAttribute(name="bilateralFilter", label="Bilateral Filter", description="Bilateral Filtering Parameters.", joinChar=":", groupDesc=[ 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, value=0,
range=(0, 9, 1), range=(0, 9, 1),
uid=[0], uid=[0],
enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='bilateralFilterSigmaSpace', name='bilateralFilterSigmaSpace',
@ -180,6 +184,7 @@ Convert or apply filtering to the input images.
value=0.0, value=0.0,
range=(0.0, 150.0, 0.01), range=(0.0, 150.0, 0.01),
uid=[0], uid=[0],
enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='bilateralFilterSigmaColor', name='bilateralFilterSigmaColor',
@ -188,6 +193,7 @@ Convert or apply filtering to the input images.
value=0.0, value=0.0,
range=(0.0, 150.0, 0.01), range=(0.0, 150.0, 0.01),
uid=[0], uid=[0],
enabled=lambda node: node.bilateralFilter.bilateralFilterEnabled.value,
), ),
]), ]),
desc.GroupAttribute(name="claheFilter", label="Clahe Filter", description="Clahe Filtering Parameters.", joinChar=":", groupDesc=[ 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, value=4.0,
range=(0.0, 8.0, 1.0), range=(0.0, 8.0, 1.0),
uid=[0], uid=[0],
enabled=lambda node: node.claheFilter.claheEnabled.value,
), ),
desc.IntParam( desc.IntParam(
name='claheTileGridSize', name='claheTileGridSize',
@ -213,6 +220,7 @@ Convert or apply filtering to the input images.
value=8, value=8,
range=(4, 64, 4), range=(4, 64, 4),
uid=[0], uid=[0],
enabled=lambda node: node.claheFilter.claheEnabled.value,
), ),
]), ]),
desc.GroupAttribute(name="noiseFilter", label="Noise Filter", description="Noise Filtering Parameters.", joinChar=":", groupDesc=[ 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'], values=['uniform', 'gaussian', 'salt'],
exclusive=True, exclusive=True,
uid=[0], uid=[0],
enabled=lambda node: node.noiseFilter.noiseEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='noiseA', name='noiseA',
@ -242,6 +251,7 @@ Convert or apply filtering to the input images.
value=0.0, value=0.0,
range=(0.0, 1.0, 0.0001), range=(0.0, 1.0, 0.0001),
uid=[0], uid=[0],
enabled=lambda node: node.noiseFilter.noiseEnabled.value,
), ),
desc.FloatParam( desc.FloatParam(
name='noiseB', name='noiseB',
@ -250,6 +260,7 @@ Convert or apply filtering to the input images.
value=1.0, value=1.0,
range=(0.0, 1.0, 0.0001), range=(0.0, 1.0, 0.0001),
uid=[0], uid=[0],
enabled=lambda node: node.noiseFilter.noiseEnabled.value,
), ),
desc.BoolParam( desc.BoolParam(
name='noiseMono', 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.', 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, value=True,
uid=[0], uid=[0],
enabled=lambda node: node.noiseFilter.noiseEnabled.value,
), ),
]), ]),
desc.ChoiceParam( desc.ChoiceParam(

2
meshroom/nodes/aliceVision/Meshing.py
View file

@ -51,6 +51,7 @@ A Graph Cut Max-Flow is applied to optimally cut the volume. This cut represents
range=(0, 100, 1), range=(0, 100, 1),
uid=[0], uid=[0],
advanced=True, advanced=True,
enabled=lambda node: node.estimateSpaceFromSfM.value,
), ),
desc.FloatParam( desc.FloatParam(
name='estimateSpaceMinObservationAngle', name='estimateSpaceMinObservationAngle',
@ -59,6 +60,7 @@ A Graph Cut Max-Flow is applied to optimally cut the volume. This cut represents
value=10, value=10,
range=(0, 120, 1), range=(0, 120, 1),
uid=[0], uid=[0],
enabled=lambda node: node.estimateSpaceFromSfM.value,
), ),
desc.IntParam( desc.IntParam(
name='maxInputPoints', name='maxInputPoints',

3
meshroom/nodes/aliceVision/PanoramaInit.py
View file

@ -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.', description='Automatically estimate the Fisheye Circle center and radius instead of using user values.',
value=True, value=True,
uid=[0], uid=[0],
enabled=lambda node: node.useFisheye.value,
), ),
desc.GroupAttribute( desc.GroupAttribute(
name="fisheyeCenterOffset", name="fisheyeCenterOffset",
@ -78,6 +79,7 @@ This node allows to setup the Panorama:
range=(-1000.0, 10000.0, 1.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( desc.FloatParam(
name='fisheyeRadius', name='fisheyeRadius',
@ -86,6 +88,7 @@ This node allows to setup the Panorama:
value=96.0, value=96.0,
range=(0.0, 150.0, 0.01), range=(0.0, 150.0, 0.01),
uid=[0], uid=[0],
enabled=lambda node: node.useFisheye.value and not node.estimateFisheyeCircle.value,
), ),
desc.ChoiceParam( desc.ChoiceParam(
name='verboseLevel', name='verboseLevel',