Merge pull request #100 from alicevision/dev_depthMapDownscale

[WIP] Move downscale to depthMap node

meshroom/nodes/aliceVision/CameraConnection.py

@@ -14,5 +14,14 @@ class CameraConnection(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 

meshroom/nodes/aliceVision/DepthMap.py

@@ -16,6 +16,15 @@ class DepthMap(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
+       desc.ChoiceParam(
+            name='downscale',
+            label='Downscale',
+            description='Image downscale factor.',
+            value=2,
+            values=[1, 2, 4, 8, 16],
+            exclusive=True,
+            uid=[0],
+        ),
         desc.IntParam(
             name='sgmMaxTCams',
             label='SGM: Nb Neighbour Cameras',
@@ -119,6 +128,15 @@ class DepthMap(desc.CommandLineNode):
             value=False,
             uid=[0],
         ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 
     outputs = [

meshroom/nodes/aliceVision/DepthMapFilter.py

@@ -63,6 +63,15 @@ class DepthMapFilter(desc.CommandLineNode):
             range=(0, 10, 1),
             uid=[0],
         ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 
     outputs = [

meshroom/nodes/aliceVision/Meshing.py

@@ -70,6 +70,15 @@ class Meshing(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 
     outputs = [

meshroom/nodes/aliceVision/PrepareDenseScene.py

@@ -15,24 +15,6 @@ class PrepareDenseScene(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
-        desc.ChoiceParam(
-            name='scale',
-            label='Scale',
-            description='''Image downscale factor.''',
-            value=2,
-            values=[1, 2, 4, 8, 16],
-            exclusive=True,
-            uid=[0],
-        ),
-        desc.ChoiceParam(
-            name='outputFileType',
-            label='Image File Type',
-            description='Output Image File Type',
-            value='exr',
-            values=['jpg', 'png', 'tif', 'exr'],
-            exclusive=True,
-            uid=[0],
-        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',

meshroom/nodes/aliceVision/Texturing.py

@@ -70,7 +70,16 @@ class Texturing(desc.CommandLineNode):
             description='''Option to flip face normals. It can be needed as it depends on the vertices order in triangles and the convention change from one software to another.''',
             value=False,
             uid=[0],
-        )
+        ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
     ]
 
     outputs = [