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

[multiview] add Graph Modification and convert inputFolder into a list of input files

Browse source 
* Always set a list of input files
* Use GraphModification to do only one update
This commit is contained in:
Fabien Castan 2017-11-06 20:51:22 +01:00
parent 1472baa477
commit 39f6ef3d64
1 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

92
meshroom/multiview.py
View file

@ -1,46 +1,62 @@
import os
import fnmatch
import re
from .core.graph import Graph
from .core.graph import Graph, GraphModification
def photogrammetryPipeline(output, inputFolder='', inputImages=[], inputViewpoints=[]):
def findFiles(folder, patterns):
rules = [re.compile(fnmatch.translate(pattern), re.IGNORECASE) for pattern in patterns]
outFiles = []
for name in os.listdir(folder):
for rule in rules:
if rule.match(name):
filepath = os.path.join(folder, name)
outFiles.append(filepath)
break
return outFiles
def photogrammetryPipeline(output='', inputFolder='', inputImages=[], inputViewpoints=[]):
# type: () -> Graph
graph = Graph('pipeline')
cameraInit = graph.addNewNode('CameraInit')
if inputFolder:
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',
input=cameraInit.outputSfm)
imageMatching = graph.addNewNode('ImageMatching',
input=featureExtraction.input,
featuresDirectory=featureExtraction.output,
)
featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input,
featuresDirectory=imageMatching.featuresDirectory,
imagePairsList=imageMatching.output)
structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input,
featuresDirectory=featureMatching.featuresDirectory,
matchesDirectory=featureMatching.output)
prepareDenseScene = graph.addNewNode('PrepareDenseScene',
input=structureFromMotion.output)
cameraConnection = graph.addNewNode('CameraConnection',
ini=prepareDenseScene.ini)
depthMap = graph.addNewNode('DepthMap',
ini=cameraConnection.ini)
depthMapFilter = graph.addNewNode('DepthMapFilter',
ini=depthMap.ini)
meshing = graph.addNewNode('Meshing',
ini=depthMapFilter.ini)
texturing = graph.addNewNode('Texturing',
ini=meshing.ini)
publish = graph.addNewNode('Publish',
inputFiles=[texturing.outputMesh, texturing.outputMaterial, texturing.outputTextures],
output=output)
with GraphModification(graph):
cameraInit = graph.addNewNode('CameraInit')
if inputFolder:
images = findFiles(inputFolder, ['*.jpg', '*.png'])
cameraInit.viewpoints.extend([{'image': image} for image in images])
if inputImages:
cameraInit.viewpoints.extend([{'image': image} for image in inputImages])
if inputViewpoints:
cameraInit.viewpoints.extend(inputViewpoints)
featureExtraction = graph.addNewNode('FeatureExtraction',
input=cameraInit.outputSfm)
imageMatching = graph.addNewNode('ImageMatching',
input=featureExtraction.input,
featuresDirectory=featureExtraction.output,
)
featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input,
featuresDirectory=imageMatching.featuresDirectory,
imagePairsList=imageMatching.output)
structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input,
featuresDirectory=featureMatching.featuresDirectory,
matchesDirectory=featureMatching.output)
prepareDenseScene = graph.addNewNode('PrepareDenseScene',
input=structureFromMotion.output)
cameraConnection = graph.addNewNode('CameraConnection',
ini=prepareDenseScene.ini)
depthMap = graph.addNewNode('DepthMap',
ini=cameraConnection.ini)
depthMapFilter = graph.addNewNode('DepthMapFilter',
ini=depthMap.ini)
meshing = graph.addNewNode('Meshing',
ini=depthMapFilter.ini)
texturing = graph.addNewNode('Texturing',
ini=meshing.ini)
publish = graph.addNewNode('Publish',
inputFiles=[texturing.outputMesh, texturing.outputMaterial, texturing.outputTextures],
output=output)
return graph