3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-19 20:16:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

[multiview] set inputs only if not empty

Browse source 
Avoid errors with None
This commit is contained in:
Fabien Castan 2017-10-31 21:21:10 +01:00
parent 40b320f1b8
commit a576fb8ce4
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meshroom/multiview.py
View file

@ -6,9 +6,13 @@ from .core.graph import Graph
def photogrammetryPipeline(inputFolder='', inputImages=[], inputViewpoints=[]): def photogrammetryPipeline(inputFolder='', inputImages=[], inputViewpoints=[]):
# type: () -> Graph # type: () -> Graph
graph = Graph('pipeline') graph = Graph('pipeline')
cameraInit = graph.addNewNode('CameraInit', imageDirectory=inputFolder) cameraInit = graph.addNewNode('CameraInit')
cameraInit.viewpoints.value = [{'image': image, 'focal': -1} for image in inputImages] if inputFolder:
cameraInit.viewpoints.extend(inputViewpoints) cameraInit.imageDirectory.value = inputFolder
if inputImages:
cameraInit.viewpoints.value = [{'image': image, 'focal': -1} for image in inputImages]
if inputViewpoints:
cameraInit.viewpoints.extend(inputViewpoints)
featureExtraction = graph.addNewNode('FeatureExtraction', featureExtraction = graph.addNewNode('FeatureExtraction',
input=cameraInit.outputSfm) input=cameraInit.outputSfm)
imageMatching = graph.addNewNode('ImageMatching', imageMatching = graph.addNewNode('ImageMatching',