Merge pull request #1073 from alicevision/dev/ldr2hdrBypass

ldr2hdr: fix bypass option

Author: fabiencastan

meshroom/nodes/aliceVision/LdrToHdrCalibration.py

@@ -1,4 +1,4 @@
-__version__ = "2.0"
+__version__ = "3.0"
 
 import json
 
@@ -49,6 +49,15 @@ class LdrToHdrCalibration(desc.CommandLineNode):
             value=desc.Node.internalFolder,
             uid=[0],
         ),
+        desc.BoolParam(
+            name='byPass',
+            label='Bypass',
+            description="Bypass HDR creation and use the medium bracket as the source for the next steps",
+            value=False,
+            uid=[0],
+            group='internal',
+            enabled= lambda node: node.nbBrackets.value != 1,
+        ),
         desc.ChoiceParam(
             name='calibrationMethod',
             label='Calibration Method',
@@ -62,6 +71,7 @@ class LdrToHdrCalibration(desc.CommandLineNode):
             value='debevec',
             exclusive=True,
             uid=[0],
+            enabled= lambda node: node.byPass.enabled and not node.byPass.value,
         ),
         desc.ChoiceParam(
             name='calibrationWeight',
@@ -75,14 +85,15 @@ class LdrToHdrCalibration(desc.CommandLineNode):
             values=['default', 'gaussian', 'triangle', 'plateau'],
             exclusive=True,
             uid=[0],
+            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=[0],
+            uid=[],
             group='user',  # not used directly on the command line
         ),
         desc.IntParam(
@@ -91,7 +102,7 @@ class LdrToHdrCalibration(desc.CommandLineNode):
             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=[],
+            uid=[0],
         ),
         desc.IntParam(
             name='channelQuantizationPower',
@@ -101,17 +112,18 @@ class LdrToHdrCalibration(desc.CommandLineNode):
             range=(8, 14, 1),
             uid=[0],
             advanced=True,
+            enabled= lambda node: node.byPass.enabled and not node.byPass.value,
         ),
         desc.IntParam(
             name='maxTotalPoints',
             label='Max Number of Points',
-            description='Max number of points selected by the sampling strategy.\n'
-                        'This ensures that this sampling step will extract a number of pixels values\n'
-                        'that the calibration step can manage (in term of computation time and memory usage).',
+            description='Max number of points used from the sampling. This ensures that the number of pixels values extracted by the sampling\n'
+                        'can be managed by the calibration step (in term of computation time and memory usage).',
             value=1000000,
             range=(8, 10000000, 1000),
             uid=[0],
             advanced=True,
+            enabled= lambda node: node.byPass.enabled and not node.byPass.value,
         ),
         desc.ChoiceParam(
             name='verboseLevel',
@@ -134,6 +146,11 @@ class LdrToHdrCalibration(desc.CommandLineNode):
         )
     ]
 
+    def processChunk(self, chunk):
+        if chunk.node.nbBrackets.value == 1 or chunk.node.byPass.value:
+            return
+        super(LdrToHdrCalibration, self).processChunk(chunk)
+
     @classmethod
     def update(cls, node):
         if not isinstance(node.nodeDesc, cls):

meshroom/nodes/aliceVision/LdrToHdrMerge.py

@@ -1,4 +1,4 @@
-__version__ = "3.0"
+__version__ = "4.0"
 
 import json
 
@@ -53,7 +53,7 @@ class LdrToHdrMerge(desc.CommandLineNode):
             description='Number of exposure brackets per HDR image (0 for automatic detection).',
             value=0,
             range=(0, 15, 1),
-            uid=[0],
+            uid=[],
             group='user',  # not used directly on the command line
         ),
         desc.IntParam(
@@ -62,7 +62,7 @@ class LdrToHdrMerge(desc.CommandLineNode):
             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=[],
+            uid=[0],
         ),
         desc.IntParam(
             name='offsetRefBracketIndex',

meshroom/nodes/aliceVision/LdrToHdrSampling.py

@@ -1,4 +1,4 @@
-__version__ = "3.0"
+__version__ = "4.0"
 
 import json
 
@@ -63,7 +63,7 @@ class LdrToHdrSampling(desc.CommandLineNode):
             description='Number of exposure brackets per HDR image (0 for automatic detection).',
             value=0,
             range=(0, 15, 1),
-            uid=[0],
+            uid=[],
             group='user',  # not used directly on the command line
         ),
         desc.IntParam(
@@ -72,7 +72,7 @@ class LdrToHdrSampling(desc.CommandLineNode):
             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=[],
+            uid=[0],
         ),
         desc.BoolParam(
             name='byPass',

meshroom/nodes/aliceVision/PanoramaWarping.py

@@ -51,11 +51,20 @@ class PanoramaWarping(desc.CommandLineNode):
                         ' * 0: all pixels will be downscaled\n'
                         ' * 50: on average the input resolution is kept (optimal to reduce over/under-sampling)\n'
                         ' * 100: all pixels will be upscaled\n',
-            value=30,
+            value=50,
             range=(0, 100, 1),
             enabled=lambda node: (node.estimateResolution.value),
             uid=[0]
         ),
+        desc.IntParam(
+            name='maxPanoramaWidth',
+            label='Max Panorama Width',
+            description='Choose the maximal output panorama width (in pixels). Zero means no limit.',
+            value=35000,
+            range=(0, 100000, 1000),
+            uid=[0],
+            enabled=lambda node: (node.estimateResolution.value),
+        ),
         desc.ChoiceParam(
             name='storageDataType',
             label='Storage Data Type',