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

[multiview] connect common attributes in LdrToHdr* nodes

Browse source
This commit is contained in:
Fabien Castan 2020-12-28 17:34:32 +01:00
parent d3d17ec6dd
commit 2b48188b32
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshroom/multiview.py
View file

@ -211,11 +211,15 @@ def panoramaHdrPipeline(graph):
ldr2hdrCalibration = graph.addNewNode('LdrToHdrCalibration', ldr2hdrCalibration = graph.addNewNode('LdrToHdrCalibration',
input=ldr2hdrSampling.input, input=ldr2hdrSampling.input,
userNbBrackets=ldr2hdrSampling.userNbBrackets, userNbBrackets=ldr2hdrSampling.userNbBrackets,
byPass=ldr2hdrSampling.byPass,
channelQuantizationPower=ldr2hdrSampling.channelQuantizationPower,
samples=ldr2hdrSampling.output) samples=ldr2hdrSampling.output)
ldr2hdrMerge = graph.addNewNode('LdrToHdrMerge', ldr2hdrMerge = graph.addNewNode('LdrToHdrMerge',
input=ldr2hdrCalibration.input, input=ldr2hdrCalibration.input,
userNbBrackets=ldr2hdrCalibration.userNbBrackets, userNbBrackets=ldr2hdrCalibration.userNbBrackets,
byPass=ldr2hdrCalibration.byPass,
channelQuantizationPower=ldr2hdrCalibration.channelQuantizationPower,
response=ldr2hdrCalibration.response) response=ldr2hdrCalibration.response)
featureExtraction = graph.addNewNode('FeatureExtraction', featureExtraction = graph.addNewNode('FeatureExtraction',

34
meshroom/nodes/aliceVision/LdrToHdrCalibration.py
View file

@ -49,6 +49,23 @@ class LdrToHdrCalibration(desc.CommandLineNode):
value=desc.Node.internalFolder, value=desc.Node.internalFolder,
uid=[0], uid=[0],
), ),
desc.IntParam(
name='userNbBrackets',
label='Number of Brackets',
description='Number of exposure brackets per HDR image (0 for automatic detection).',
value=0,
range=(0, 15, 1),
uid=[],
group='user', # not used directly on the command line
),
desc.IntParam(
name='nbBrackets',
label='Automatic Nb Brackets',
description='Number of exposure brackets used per HDR image. It is detected automatically from input Viewpoints metadata if "userNbBrackets" is 0, else it is equal to "userNbBrackets".',
value=0,
range=(0, 10, 1),
uid=[0],
),
desc.BoolParam( desc.BoolParam(
name='byPass', name='byPass',
label='Bypass', label='Bypass',
@ -87,23 +104,6 @@ class LdrToHdrCalibration(desc.CommandLineNode):
uid=[0], uid=[0],
enabled= lambda node: node.byPass.enabled and not node.byPass.value, enabled= lambda node: node.byPass.enabled and not node.byPass.value,
), ),
desc.IntParam(
name='userNbBrackets',
label='Number of Brackets',
description='Number of exposure brackets per HDR image (0 for automatic detection).',
value=0,
range=(0, 15, 1),
uid=[],
group='user', # not used directly on the command line
),
desc.IntParam(
name='nbBrackets',
label='Automatic Nb Brackets',
description='Number of exposure brackets used per HDR image. It is detected automatically from input Viewpoints metadata if "userNbBrackets" is 0, else it is equal to "userNbBrackets".',
value=0,
range=(0, 10, 1),
uid=[0],
),
desc.IntParam( desc.IntParam(
name='channelQuantizationPower', name='channelQuantizationPower',
label='Channel Quantization Power', label='Channel Quantization Power',