[nodes] create default values from os.environ directly in nodes

This commit is contained in:
Fabien Castan 2017-10-26 16:10:14 +02:00
parent c38c2d3407
commit 0bdad5a588
3 changed files with 5 additions and 5 deletions

View file

@ -6,14 +6,12 @@ from .core.graph import Graph
def photogrammetryPipeline(): def photogrammetryPipeline():
# type: () -> Graph # type: () -> Graph
graph = Graph('pipeline') graph = Graph('pipeline')
cameraInit = graph.addNewNode('CameraInit', cameraInit = graph.addNewNode('CameraInit')
sensorDatabase=os.environ.get('ALICEVISION_SENSOR_DB', None))
featureExtraction = graph.addNewNode('FeatureExtraction', featureExtraction = graph.addNewNode('FeatureExtraction',
input=cameraInit.outputSfm) input=cameraInit.outputSfm)
imageMatching = graph.addNewNode('ImageMatching', imageMatching = graph.addNewNode('ImageMatching',
input=cameraInit.outputSfm, input=cameraInit.outputSfm,
featuresDirectory=featureExtraction.output, featuresDirectory=featureExtraction.output,
tree=os.environ.get('ALICEVISION_VOCTREE', None),
) )
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=cameraInit.outputSfm, input=cameraInit.outputSfm,

View file

@ -1,4 +1,5 @@
import sys import sys
import os
from meshroom.core import desc from meshroom.core import desc
@ -24,7 +25,7 @@ class CameraInit(desc.CommandLineNode):
sensorDatabase = desc.File( sensorDatabase = desc.File(
label='Sensor Database', label='Sensor Database',
description='''Camera sensor width database path.''', description='''Camera sensor width database path.''',
value='', value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
uid=[0], uid=[0],
isOutput=False, isOutput=False,
) )

View file

@ -1,4 +1,5 @@
import sys import sys
import os
from meshroom.core import desc from meshroom.core import desc
@ -23,7 +24,7 @@ class ImageMatching(desc.CommandLineNode):
tree = desc.File( tree = desc.File(
label='Tree', label='Tree',
description='''Input name for the vocabulary tree file.''', description='''Input name for the vocabulary tree file.''',
value='', value=os.environ.get('ALICEVISION_VOCTREE', ''),
uid=[0], uid=[0],
isOutput=False, isOutput=False,
) )