[nodes] Remove CameraConnection node

meshroom/multiview.py

@@ -121,20 +121,14 @@ def mvsPipeline(graph, sfm=None):
 
     prepareDenseScene = graph.addNewNode('PrepareDenseScene',
                                          input=sfm.output if sfm else "")
-    cameraConnection = graph.addNewNode('CameraConnection',
-                                        input=prepareDenseScene.input,
-                                        imagesFolder=prepareDenseScene.output)
     depthMap = graph.addNewNode('DepthMap',
-                                input=cameraConnection.input,
-                                cameraPairsMatrixFolder=cameraConnection.output,
-                                imagesFolder=cameraConnection.imagesFolder)
+                                input=prepareDenseScene.input,
+                                imagesFolder=prepareDenseScene.output)
     depthMapFilter = graph.addNewNode('DepthMapFilter',
                                       input=depthMap.input,
-                                      cameraPairsMatrixFolder=depthMap.cameraPairsMatrixFolder,
                                       depthMapFolder=depthMap.output)
     meshing = graph.addNewNode('Meshing',
                                input=depthMapFilter.input,
-                               cameraPairsMatrixFolder=depthMapFilter.cameraPairsMatrixFolder,
                                depthMapFolder=depthMapFilter.depthMapFolder,
                                depthMapFilterFolder=depthMapFilter.output)
     meshFiltering = graph.addNewNode('MeshFiltering',
@@ -147,7 +141,6 @@ def mvsPipeline(graph, sfm=None):
 
     return [
         prepareDenseScene,
-        cameraConnection,
         depthMap,
         depthMapFilter,
         meshing,

meshroom/nodes/aliceVision/CameraConnection.py

@@ -1,46 +0,0 @@
-__version__ = "1.0"
-
-from meshroom.core import desc
-
-
-class CameraConnection(desc.CommandLineNode):
-    internalFolder = desc.Node.internalFolder
-    commandLine = 'aliceVision_cameraConnection {allParams}'
-    size = desc.DynamicNodeSize('input')
-
-    inputs = [
-        desc.File(
-            name='input',
-            label='Input',
-            description='SfMData file.',
-            value='',
-            uid=[0],
-        ),
-        desc.File(
-            name='imagesFolder',
-            label='Images Folder',
-            description='Use images from a specific folder. Filename should be the image uid.',
-            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 = [
-    desc.File(
-        name='output',
-        label='Output',
-        description='Output folder for the camera pairs matrix file.',
-        value=desc.Node.internalFolder,
-        uid=[],
-    )
-]
-

meshroom/nodes/aliceVision/DepthMap.py

@@ -17,13 +17,6 @@ class DepthMap(desc.CommandLineNode):
             description='SfMData file.',
             value='',
             uid=[0],
-        ),
-        desc.File(
-            name='cameraPairsMatrixFolder',
-            label='Camera Pairs Matrix Folder',
-            description='Camera pairs matrix folder.',
-            value='',
-            uid=[0],
         ),        
         desc.File(
             name='imagesFolder',

meshroom/nodes/aliceVision/DepthMapFilter.py

@@ -17,14 +17,7 @@ class DepthMapFilter(desc.CommandLineNode):
             description='SfMData file.',
             value='',
             uid=[0],
-        ),
-        desc.File(
-            name='cameraPairsMatrixFolder',
-            label='Camera Pairs Matrix Folder',
-            description='Camera pairs matrix folder.',
-            value='',
-            uid=[0],
-        ),        
+        ),    
         desc.File(
             name="depthMapFolder",
             label="Depth Map Folder",

meshroom/nodes/aliceVision/Meshing.py

@@ -17,13 +17,6 @@ class Meshing(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
-        desc.File(
-            name='cameraPairsMatrixFolder',
-            label='Camera Pairs Matrix Folder',
-            description='Camera pairs matrix folder.',
-            value='',
-            uid=[0],
-        ),   
         desc.File(
             name='imagesFolder',
             label='Images Folder',