From 3fe6c22bc2b01b348b9d76d0a2307ccbde71f9ba Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Fri, 18 Dec 2020 01:15:12 +0100 Subject: [PATCH] [multiview] Add connections between params in default pipelines --- meshroom/multiview.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/meshroom/multiview.py b/meshroom/multiview.py index 616e4d04..48b0e4b9 100644 --- a/meshroom/multiview.py +++ b/meshroom/multiview.py @@ -210,10 +210,12 @@ def panoramaHdrPipeline(graph): ldr2hdrCalibration = graph.addNewNode('LdrToHdrCalibration', input=ldr2hdrSampling.input, + userNbBrackets=ldr2hdrSampling.userNbBrackets, samples=ldr2hdrSampling.output) ldr2hdrMerge = graph.addNewNode('LdrToHdrMerge', input=ldr2hdrCalibration.input, + userNbBrackets=ldr2hdrCalibration.userNbBrackets, response=ldr2hdrCalibration.response) featureExtraction = graph.addNewNode('FeatureExtraction', @@ -233,12 +235,14 @@ def panoramaHdrPipeline(graph): featureMatching = graph.addNewNode('FeatureMatching', input=imageMatching.input, featuresFolders=imageMatching.featuresFolders, - imagePairsList=imageMatching.output) + imagePairsList=imageMatching.output, + describerTypes=featureExtraction.describerTypes) panoramaEstimation = graph.addNewNode('PanoramaEstimation', - input=featureMatching.input, - featuresFolders=featureMatching.featuresFolders, - matchesFolders=[featureMatching.output]) + input=featureMatching.input, + featuresFolders=featureMatching.featuresFolders, + matchesFolders=[featureMatching.output], + describerTypes=featureMatching.describerTypes) panoramaOrientation = graph.addNewNode('SfMTransform', input=panoramaEstimation.output, @@ -340,11 +344,13 @@ def sfmPipeline(graph): featureMatching = graph.addNewNode('FeatureMatching', input=imageMatching.input, featuresFolders=imageMatching.featuresFolders, - imagePairsList=imageMatching.output) + imagePairsList=imageMatching.output, + describerTypes=featureExtraction.describerTypes) structureFromMotion = graph.addNewNode('StructureFromMotion', input=featureMatching.input, featuresFolders=featureMatching.featuresFolders, - matchesFolders=[featureMatching.output]) + matchesFolders=[featureMatching.output], + describerTypes=featureMatching.describerTypes) return [ cameraInit, featureExtraction, @@ -419,16 +425,18 @@ def sfmAugmentation(graph, sourceSfm, withMVS=False): featureMatching = graph.addNewNode('FeatureMatching', input=imageMatchingMulti.outputCombinedSfM, featuresFolders=imageMatchingMulti.featuresFolders, - imagePairsList=imageMatchingMulti.output) + imagePairsList=imageMatchingMulti.output, + describerTypes=featureExtraction.describerTypes) structureFromMotion = graph.addNewNode('StructureFromMotion', input=featureMatching.input, featuresFolders=featureMatching.featuresFolders, - matchesFolders=[featureMatching.output]) + matchesFolders=[featureMatching.output], + describerTypes=featureMatching.describerTypes) graph.addEdge(sourceSfm.output, imageMatchingMulti.inputB) sfmNodes = [ cameraInit, - featureMatching, + featureExtraction, imageMatchingMulti, featureMatching, structureFromMotion