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

[nodes] use 'desc.Node.internalFolder' in outputs values

Browse source 
* avoid duplicating the same string everywhere
* don't override 'internalFolder' with the same value default value in subclasses
This commit is contained in:
Yann Lanthony 2018-07-09 17:32:34 +02:00
parent 2eb2c3ac6f
commit 346277629a
34 changed files with 41 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meshroom/nodes/aliceVision/CameraInit.py
View file

@ -43,7 +43,6 @@ Intrinsic = [
class CameraInit(desc.CommandLineNode):
internalFolder = '{cache}/{nodeType}/{uid0}/'
commandLine = 'aliceVision_cameraInit {allParams} --allowSingleView 1' # don't throw an error if there is only one image
size = desc.DynamicNodeSize('viewpoints')
@ -94,7 +93,7 @@ class CameraInit(desc.CommandLineNode):
name='output',
label='Output SfMData File',
description='''Output SfMData.''',
value='{cache}/{nodeType}/{uid0}/cameraInit.sfm',
value=desc.Node.internalFolder + 'cameraInit.sfm',
uid=[],
),
]
@ -185,7 +184,7 @@ class CameraInit(desc.CommandLineNode):
"featureFolder": "",
"matchingFolder": "",
}
node.viewpointsFile = '{cache}/{nodeType}/{uid0}/viewpoints.sfm'.format(**node._cmdVars)
node.viewpointsFile = (node.nodeDesc.internalFolder + '/viewpoints.sfm').format(**node._cmdVars)
with open(node.viewpointsFile, 'w') as f:
json.dump(sfmData, f, indent=4)