mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-05-30 01:16:33 +02:00
[core] ListAttribute and GroupAttribute can now be exported on command line
* 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:
parent
7ceea28174
commit
ad84d20eb5
2 changed files with 19 additions and 6 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue