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

[graph] simplify methods related to Attribute values and links

Browse source
This commit is contained in:
Yann Lanthony 2017-10-24 18:59:47 +02:00
parent 75ddea0329
commit 61ade5bfa7
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
meshroom/core/graph.py
View file

@ -139,18 +139,11 @@ class Attribute(BaseObject):
@property
def isLink(self):
"""
If the attribute is a link to another attribute.
"""
if self.attributeDesc.isOutput:
return False
else:
return self in self.node.graph.edges.keys()
""" Whether the attribute is a link to another attribute. """
return not self.isOutput and self in self.node.graph.edges.keys()
def getLinkParam(self):
if not self.isLink:
return None
return self.node.graph.edge(self).src
return self.node.graph.edge(self).src if self.isLink else None
def _applyExpr(self):
"""
@ -172,11 +165,7 @@ class Attribute(BaseObject):
self._value = ""
def getExportValue(self):
value = self._value
# print('getExportValue: ', self.name(), value, self.isLink())
if self.isLink:
value = '{' + self.getLinkParam().fullName() + '}'
return value
return '{' + self.getLinkParam().fullName() + '}' if self.isLink else self._value
name = Property(str, getName, constant=True)
label = Property(str, getLabel, constant=True)
@ -439,10 +428,7 @@ class Node(BaseObject):
for name, attr in self._attributes.objects.items():
if attr.attributeDesc.isOutput:
continue # skip outputs
linkAttr = attr.getLinkParam()
if linkAttr:
attr._value = linkAttr._value
v = attr._value
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)
@ -461,7 +447,7 @@ class Node(BaseObject):
attr.value = attr.attributeDesc.value.format(
nodeType=self.nodeType,
**self._cmdVars)
v = attr._value
v = attr.value
self._cmdVars[name] = '--{name} {value}'.format(name=name, value=v)
self._cmdVars[name + 'Value'] = str(v)

4
meshroom/ui/commands.py
View file

@ -124,11 +124,11 @@ class SetAttributeCommand(GraphCommand):
def redoImpl(self):
if self.value == self.oldValue:
return False
self.graph.node(self.nodeName).attribute(self.attrName).value = self.value
self.graph.attribute(self.attrName).value = self.value
return True
def undoImpl(self):
self.graph.node(self.nodeName).attribute(self.attrName).value = self.oldValue
self.graph.attribute(self.attrName).value = self.oldValue
class AddEdgeCommand(GraphCommand):