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

Merge pull request #1055 from alicevision/dev/panoramaAdjustParams

Browse source 
[nodes] PanoramaWarping: boolean parameter to estimate the resolution automatically
This commit is contained in:
Fabien Castan 2020-09-10 20:18:17 +02:00 • committed by GitHub
commit 5dcb2c9ca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,9 @@ class LdrToHdrCalibration(desc.CommandLineNode):
commandLine = 'aliceVision_LdrToHdrCalibration {allParams}' commandLine = 'aliceVision_LdrToHdrCalibration {allParams}'
size = desc.DynamicNodeSize('input') size = desc.DynamicNodeSize('input')
cpu = desc.Level.INTENSIVE
ram = desc.Level.NORMAL
documentation = ''' documentation = '''
Calibrate LDR to HDR response curve from samples Calibrate LDR to HDR response curve from samples
''' '''

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

@ -10,6 +10,9 @@ class PanoramaCompositing(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaCompositing {allParams}' commandLine = 'aliceVision_panoramaCompositing {allParams}'
size = desc.DynamicNodeSize('input') size = desc.DynamicNodeSize('input')
cpu = desc.Level.INTENSIVE
ram = desc.Level.INTENSIVE
documentation = ''' documentation = '''
Once the images have been transformed geometrically (in PanoramaWarping), Once the images have been transformed geometrically (in PanoramaWarping),
they have to be fused together in a single panorama image which looks like a single photography. they have to be fused together in a single panorama image which looks like a single photography.

19
meshroom/nodes/aliceVision/PanoramaWarping.py
View file

@ -25,20 +25,27 @@ Compute the image warping for each input image in the panorama coordinate system
value='', value='',
uid=[0], uid=[0],
), ),
desc.BoolParam(
name='estimateResolution',
label='Estimate Resolution',
description='Estimate output panorama resolution automatically based on the input images resolution.',
value=True,
uid=[0],
group=None, # skip group from command line
),
desc.IntParam( desc.IntParam(
name='panoramaWidth', name='panoramaWidth',
label='Panorama Width', label='Panorama Width',
description='Panorama Width (in pixels).\n' description='Choose the output panorama width (in pixels).',
'Set 0 to let the software choose the size automatically, based on "percentUpscale" parameter.',
value=10000, value=10000,
range=(0, 50000, 1000), range=(0, 50000, 1000),
uid=[0] uid=[0],
enabled=lambda node: (not node.estimateResolution.value),
), ),
desc.IntParam( desc.IntParam(
name='percentUpscale', name='percentUpscale',
label='Upscale ratio', label='Upscale ratio',
description='Upscale percent\n' description='Percentage of upscaled pixels.\n'
'Only used if panorama width is set to 0 for automatic estimation.\n'
'\n' '\n'
'How many percent of the pixels will be upscaled (compared to its original resolution):\n' 'How many percent of the pixels will be upscaled (compared to its original resolution):\n'
' * 0: all pixels will be downscaled\n' ' * 0: all pixels will be downscaled\n'
@ -46,7 +53,7 @@ Compute the image warping for each input image in the panorama coordinate system
' * 100: all pixels will be upscaled\n', ' * 100: all pixels will be upscaled\n',
value=50, value=50,
range=(0, 100, 1), range=(0, 100, 1),
enabled=lambda node: (node.panoramaWidth.value == 0), enabled=lambda node: (node.estimateResolution.value),
uid=[0] uid=[0]
), ),
desc.ChoiceParam( desc.ChoiceParam(