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

[graph] improve Node constructor arguments naming

Browse source
This commit is contained in:
Yann Lanthony 2018-01-05 19:12:49 +01:00
parent c3eda1e629
commit 614ef3a5d1
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
meshroom/core/graph.py
View file

@ -693,9 +693,18 @@ class Node(BaseObject):
# i.e: a.b, a[0], a[0].b.c[1] # i.e: a.b, a[0], a[0].b.c[1]
attributeRE = re.compile(r'\.?(?P<name>\w+)(?:\[(?P<index>\d+)\])?') attributeRE = re.compile(r'\.?(?P<name>\w+)(?:\[(?P<index>\d+)\])?')
def __init__(self, nodeDesc, parent=None, **kwargs): def __init__(self, nodeType, parent=None, **kwargs):
"""
Create a new Node instance based of the given node type name (name of a desc.Node subclass).
Any other keyword argument will be used to initialize this node's attributes.
Args:
nodeType: the node type name
parent (BaseObject): this Node's parent
**kwargs: attributes values
"""
super(Node, self).__init__(parent) super(Node, self).__init__(parent)
self.nodeDesc = meshroom.core.nodesDesc[nodeDesc]() self.nodeDesc = meshroom.core.nodesDesc[nodeType]()
self.packageName = self.nodeDesc.packageName self.packageName = self.nodeDesc.packageName
self.packageVersion = self.nodeDesc.packageVersion self.packageVersion = self.nodeDesc.packageVersion
@ -1186,12 +1195,12 @@ class Graph(BaseObject):
return inEdges, outEdges return inEdges, outEdges
def addNewNode(self, nodeDesc, name=None, **kwargs): def addNewNode(self, nodeType, name=None, **kwargs):
""" """
Create and add a new node to the graph. Create and add a new node to the graph.
Args: Args:
nodeDesc (desc.Node): the node description to use. nodeType (str): the node type name.
name (str): if specified, the desired name for this node. If not unique, will be prefixed (_N). name (str): if specified, the desired name for this node. If not unique, will be prefixed (_N).
**kwargs: keyword arguments to initialize node's attributes **kwargs: keyword arguments to initialize node's attributes
@ -1200,7 +1209,7 @@ class Graph(BaseObject):
""" """
if name and name in self._nodes.keys(): if name and name in self._nodes.keys():
name = self._createUniqueNodeName(name) name = self._createUniqueNodeName(name)
n = self.addNode(Node(nodeDesc=nodeDesc, **kwargs), uniqueName=name) n = self.addNode(Node(nodeType=nodeType, **kwargs), uniqueName=name)
n.updateInternals() n.updateInternals()
return n return n

2
meshroom/ui/commands.py
View file

@ -113,7 +113,7 @@ class RemoveNodeCommand(GraphCommand):
def undoImpl(self): def undoImpl(self):
with GraphModification(self.graph): with GraphModification(self.graph):
node = self.graph.addNewNode(nodeDesc=self.nodeDict["nodeType"], node = self.graph.addNewNode(nodeType=self.nodeDict["nodeType"],
name=self.nodeName, **self.nodeDict["attributes"]) name=self.nodeName, **self.nodeDict["attributes"])
assert (node.getName() == self.nodeName) assert (node.getName() == self.nodeName)
# recreate out edges deleted on node removal # recreate out edges deleted on node removal