3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-31 01:46:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] ListAttribute and GroupAttribute can now be exported on command line

Browse source 
* ListAttribute, GroupAttribute: can now be exported on command line
with customizable join character.
* ChoiceParam with non exclusive values are exported on command line as
before but using the new getValueStr()
This commit is contained in:
Fabien Castan 2018-01-02 14:41:17 +01:00
parent 7ceea28174
commit ad84d20eb5
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meshroom/core/desc.py
View file

@ -34,15 +34,17 @@ class Attribute(BaseObject):
class ListAttribute(Attribute):
""" A list of Attributes """
def __init__(self, elementDesc, name, label, description, group='allParams'):
def __init__(self, elementDesc, name, label, description, group='allParams', joinChar=' '):
"""
:param elementDesc: the Attribute description of elements to store in that list
"""
self._elementDesc = elementDesc
self._joinChar = joinChar
super(ListAttribute, self).__init__(name=name, label=label, description=description, value=None, uid=(), group=group)
elementDesc = Property(Attribute, lambda self: self._elementDesc, constant=True)
uid = Property(Variant, lambda self: self.elementDesc.uid, constant=True)
joinChar = Property(str, lambda self: self._joinChar, constant=True)
def validateValue(self, value):
if not (isinstance(value, collections.Iterable) and isinstance(value, basestring)):
@ -52,11 +54,12 @@ class ListAttribute(Attribute):
class GroupAttribute(Attribute):
""" A macro Attribute composed of several Attributes """
def __init__(self, groupDesc, name, label, description, group='allParams'):
def __init__(self, groupDesc, name, label, description, group='allParams', joinChar=' '):
"""
:param groupDesc: the description of the Attributes composing this group
"""
self._groupDesc = groupDesc
self._joinChar = joinChar
super(GroupAttribute, self).__init__(name=name, label=label, description=description, value=None, uid=(), group=group)
groupDesc = Property(Variant, lambda self: self._groupDesc, constant=True)
@ -73,6 +76,7 @@ class GroupAttribute(Attribute):
return allUids
uid = Property(Variant, retrieveChildrenUids, constant=True)
joinChar = Property(str, lambda self: self._joinChar, constant=True)
class Param(Attribute):

17
meshroom/core/graph.py
View file

@ -245,6 +245,12 @@ class Attribute(BaseObject):
return self.desc.value
return self._value
def getValueStr(self):
if isinstance(self.attributeDesc, desc.ChoiceParam) and not self.attributeDesc.exclusive:
assert(isinstance(self.value, collections.Sequence) and not isinstance(self.value, basestring))
return self.attributeDesc.joinChar.join(self.value)
return str(self.value)
def isDefault(self):
return self._value == self.desc.value
@ -334,6 +340,9 @@ class ListAttribute(Attribute):
else:
return [attr.getPrimitiveValue(exportDefault=exportDefault) for attr in self._value if not attr.isDefault()]
def getValueStr(self):
return self.attributeDesc.joinChar.join([v.getValueStr() for v in self._value])
# Override value property setter
value = Property(Variant, Attribute._get_value, _set_value, notify=Attribute.valueChanged)
@ -388,6 +397,9 @@ class GroupAttribute(Attribute):
else:
return {name: attr.getPrimitiveValue(exportDefault=exportDefault) for name, attr in self._value.items() if not attr.isDefault()}
def getValueStr(self):
return self.attributeDesc.joinChar.join([v.getValueStr() for v in self._value.objects.values()])
# Override value property
value = Property(Variant, Attribute._get_value, _set_value, notify=Attribute.valueChanged)
@ -782,10 +794,7 @@ class Node(BaseObject):
for name, attr in self._attributes.objects.items():
if attr.isOutput:
continue # skip outputs
v = attr.value
if isinstance(attr.attributeDesc, desc.ChoiceParam) and not attr.attributeDesc.exclusive:
assert(isinstance(v, collections.Sequence) and not isinstance(v, basestring))
v = attr.attributeDesc.joinChar.join(v)
v = attr.getValueStr()
cmdVars[name] = '--{name} {value}'.format(name=name, value=v)
cmdVars[name + 'Value'] = str(v)