Merge pull request #135 from alicevision/dev_sfmOptions

Add support for AliceVision dev_sfmOptions branch
This commit is contained in:
Fabien Castan 2018-07-02 16:15:34 +02:00 committed by GitHub
commit 6e815c5d19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 377 additions and 231 deletions

View file

@ -63,6 +63,13 @@ class CameraInit(desc.CommandLineNode):
description="Camera Intrinsics",
group="",
),
desc.File(
name='sensorDatabase',
label='Sensor Database',
description='''Camera sensor width database path.''',
value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
uid=[],
),
desc.FloatParam(
name='defaultFieldOfView',
label='Default Field Of View',
@ -71,13 +78,6 @@ class CameraInit(desc.CommandLineNode):
range=(0, 180.0, 1),
uid=[0],
),
desc.File(
name='sensorDatabase',
label='Sensor Database',
description='''Camera sensor width database path.''',
value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
uid=[],
),
desc.ChoiceParam(
name='verboseLevel',
label='Verbose Level',
@ -92,7 +92,7 @@ class CameraInit(desc.CommandLineNode):
outputs = [
desc.File(
name='output',
label='Output',
label='Output SfMData File',
description='''Output SfMData.''',
value='{cache}/{nodeType}/{uid0}/cameraInit.sfm',
uid=[],
@ -136,6 +136,7 @@ class CameraInit(desc.CommandLineNode):
# Reload result of aliceVision_cameraInit
cameraInitSfM = node.output.value
jsonData = open(cameraInitSfM, 'r').read()
jsonData = jsonData.decode('utf8', errors='ignore')
data = json.loads(jsonData)
intrinsicsKeys = [i.name for i in Intrinsic]