[core] change Attributes declaration on Node description

Inputs and outputs Attributes are now declared in two separate lists
* no more isOutput field on Attribute description
* guarantee attributes order (was not the case in Python2 with class attributes)
* Attribute's name is now part of its description

Note: for now, input and output Attributes are still stored in a single model inside a Graph.
This commit is contained in:
Yann Lanthony 2017-10-31 19:47:32 +01:00
parent 00366cda00
commit 16e8037fd7
18 changed files with 506 additions and 405 deletions

View file

@ -6,42 +6,49 @@ class PrepareDenseScene(desc.CommandLineNode):
internalFolder = '{cache}/{nodeType}/{uid0}/'
commandLine = 'aliceVision_prepareDenseScene {allParams}'
input = desc.File(
inputs = [
desc.File(
name='input',
label='Input',
description='''SfMData file.''',
value='',
uid=[0],
isOutput=False,
)
mvsConfig = desc.File(
label='MVS Configuration file',
description='',
value='{cache}/{nodeType}/{uid0}/_tmp_scale{scaleValue}/mvs.ini',
uid=[0],
isOutput=True,
group='', # not a command line arg
)
output = desc.File(
label='Output',
description='''Output directory.''',
value='{cache}/{nodeType}/{uid0}/',
uid=[],
isOutput=True,
)
scale = desc.ChoiceParam(
),
desc.ChoiceParam(
name='scale',
label='Scale',
description='''Image downscale factor.''',
value=2,
values=[1, 2, 4, 8, 16],
exclusive=True,
uid=[0],
)
verboseLevel = desc.ChoiceParam(
),
desc.ChoiceParam(
name='verboseLevel',
label='Verbose Level',
description='''verbosity level (fatal, error, warning, info, debug, trace).''',
value='info',
values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
exclusive=True,
uid=[0],
)
),
]
outputs = [
desc.File(
name='ini',
label='MVS Configuration file',
description='',
value='{cache}/{nodeType}/{uid0}/_tmp_scale{scaleValue}/mvs.ini',
uid=[0],
group='', # not a command line arg
),
desc.File(
name='output',
label='Output',
description='''Output directory.''',
value='{cache}/{nodeType}/{uid0}/',
uid=[],
)
]