Replace reference to hash with id/nodeid

pull/94/head
Ryan Miller 6 years ago
parent 65fd23cf67
commit ae01d85319

@ -159,13 +159,13 @@ class Diagram:
return True return True
return False return False
def node(self, hashid: str, label: str, **attrs) -> None: def node(self, nodeid: str, label: str, **attrs) -> None:
"""Create a new node.""" """Create a new node."""
self.dot.node(hashid, label=label, **attrs) self.dot.node(nodeid, label=label, **attrs)
def connect(self, node: "Node", node2: "Node", edge: "Edge") -> None: def connect(self, node: "Node", node2: "Node", edge: "Edge") -> None:
"""Connect the two Nodes.""" """Connect the two Nodes."""
self.dot.edge(node.hashid, node2.hashid, **edge.attrs) self.dot.edge(node.nodeid, node2.nodeid, **edge.attrs)
def subgraph(self, dot: Digraph) -> None: def subgraph(self, dot: Digraph) -> None:
"""Create a subgraph for clustering""" """Create a subgraph for clustering"""
@ -243,9 +243,9 @@ class Cluster:
return True return True
return False return False
def node(self, hashid: str, label: str, **attrs) -> None: def node(self, nodeid: str, label: str, **attrs) -> None:
"""Create a new node in the cluster.""" """Create a new node in the cluster."""
self.dot.node(hashid, label=label, **attrs) self.dot.node(nodeid, label=label, **attrs)
def subgraph(self, dot: Digraph) -> None: def subgraph(self, dot: Digraph) -> None:
self.dot.subgraph(dot) self.dot.subgraph(dot)
@ -268,7 +268,7 @@ class Node:
:param label: Node label. :param label: Node label.
""" """
# Generates a hash for identifying a node. # Generates a hash for identifying a node.
self._hash = self._rand_hash() self._id = self._rand_id()
self.label = label self.label = label
# fmt: off # fmt: off
@ -291,9 +291,9 @@ class Node:
# If a node is in the cluster context, add it to cluster. # If a node is in the cluster context, add it to cluster.
if self._cluster: if self._cluster:
self._cluster.node(self._hash, self.label, **self.attrs) self._cluster.node(self._id, self.label, **self.attrs)
else: else:
self._diagram.node(self._hash, self.label, **self.attrs) self._diagram.node(self._id, self.label, **self.attrs)
def __repr__(self): def __repr__(self):
_name = self.__class__.__name__ _name = self.__class__.__name__
@ -366,8 +366,8 @@ class Node:
return self return self
@property @property
def hashid(self): def nodeid(self):
return self._hash return self._id
# TODO: option for adding flow description to the connection edge # TODO: option for adding flow description to the connection edge
def connect(self, node: "Node", edge: "Edge"): def connect(self, node: "Node", edge: "Edge"):
@ -386,7 +386,7 @@ class Node:
return node return node
@staticmethod @staticmethod
def _rand_hash(): def _rand_id():
return uuid.uuid4().hex return uuid.uuid4().hex
def _load_icon(self): def _load_icon(self):

Loading…
Cancel
Save