Skip to content
Snippets Groups Projects
Commit 4a504065 authored by Vincent Texier's avatar Vincent Texier
Browse files

Display shortest path between account member and selected member in WoT

parent d60f42ff
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/cutecoin/gui/views/wot.py
+ 55
− 26
View file @ 4a504065
......@@ -55,7 +55,6 @@ class WotView(QGraphicsView):
class Scene(QGraphicsScene):
# This defines signals taking string arguments
node_clicked = pyqtSignal(dict, name='nodeClicked')
node_signed = pyqtSignal(dict, name='nodeSigned')
......@@ -73,6 +72,8 @@ class Scene(QGraphicsScene):
self.lastDragPos = QPoint()
self.setItemIndexMethod(QGraphicsScene.NoIndex)
# list of nodes in scene
self.nodes = dict()
# axis of the scene for debug purpose
# self.addLine(-100, 0, 100, 0)
# self.addLine(0, -100, 0, 100)
......@@ -88,6 +89,7 @@ class Scene(QGraphicsScene):
"""
node = Node(metadata, pos)
self.addItem(node)
self.nodes[node.id] = node
return node
def add_arc(self, source_node, destination_node, metadata):
......@@ -140,7 +142,8 @@ class Scene(QGraphicsScene):
y = 0
x = -200
# sort by text
nodes = ((k, v) for (k, v) in sorted(graph.items(), key=lambda kv: kv[1]['text'].lower()) if selected_id in (arc['id'] for arc in v['arcs']))
nodes = ((k, v) for (k, v) in sorted(graph.items(), key=lambda kv: kv[1]['text'].lower()) if
selected_id in (arc['id'] for arc in v['arcs']))
# add nodes and arcs
for _id, certifier_node in nodes:
node = self.add_node(certifier_node, (x, y))
......@@ -151,6 +154,31 @@ class Scene(QGraphicsScene):
self.update()
def update_path(self, path):
x = 0
y = 0
for json_node in path:
if json_node['status'] & NODE_STATUS_SELECTED:
previous_node = json_node
y -= 100
continue
node = self.add_node(json_node, (x, y))
skip_reverse_arc = False
for arc in json_node['arcs']:
if arc['id'] == previous_node['id']:
#print("arc from %s to %s" % (node.id, previous_node['id']))
self.add_arc(node, self.nodes[previous_node['id']], arc)
skip_reverse_arc = True
break
if not skip_reverse_arc:
for arc in previous_node['arcs']:
if arc['id'] == json_node['id']:
#print("arc from %s to %s" % (previous_node['id'], node.id))
self.add_arc(self.nodes[previous_node['id']], node, arc)
previous_node = json_node
y -= 100
class Node(QGraphicsEllipseItem):
def __init__(self, metadata, x_y):
......@@ -166,6 +194,7 @@ class Node(QGraphicsEllipseItem):
super(Node, self).__init__()
self.metadata = metadata
self.id = metadata['id']
self.status_wallet = self.metadata['status'] & NODE_STATUS_HIGHLIGHTED
self.status_member = not self.metadata['status'] & NODE_STATUS_OUT
self.text = self.metadata['text']
......@@ -204,7 +233,8 @@ class Node(QGraphicsEllipseItem):
)
# set anchor to the center
self.setTransform(QTransform().translate(-self.boundingRect().width()/2.0, -self.boundingRect().height()/2.0))
self.setTransform(
QTransform().translate(-self.boundingRect().width() / 2.0, -self.boundingRect().height() / 2.0))
self.setPos(x, y)
#print(x, y)
# center text in ellipse
......@@ -294,6 +324,7 @@ class Node(QGraphicsEllipseItem):
# trigger scene signal
self.scene().node_contact.emit(self.metadata)
class Arc(QGraphicsLineItem):
def __init__(self, source_node, destination_node, metadata):
"""
......@@ -406,10 +437,8 @@ class Arc(QGraphicsLineItem):
angle = (2.0 * math.pi) - angle
# arrow in the middle of the arc
hpx = (line.p2().x() + line.p1().x()) / 2.0
hpy = (line.p2().y() - line.p1().y()) / 2.0
if line.dy() < 0:
hpy = -hpy
hpx = line.p1().x() + (line.dx() / 2.0)
hpy = line.p1().y() + (line.dy() / 2.0)
head_point = QPointF(hpx, hpy)
painter.setPen(QPen(color, 1, Qt.SolidLine, Qt.RoundCap, Qt.RoundJoin))
......
src/cutecoin/gui/wot_tab.py
+ 10
− 18
View file @ 4a504065
......@@ -62,7 +62,8 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
:param dict metadata: Graph node metadata of the identity
"""
print("draw graph !!!!!!!!!!!! - " + metadata['text'])
logging.debug("draw graph !!!!!!!!!!!! - " + metadata['text'])
# create Person from node metadata
person = get_person_from_metadata(metadata)
person_account = Person(self.account.name, self.account.pubkey)
......@@ -95,13 +96,15 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
# populate graph with certified-by
self.add_certified_list_to_graph(graph, certified_list, person, person_account)
# draw graph in qt scene
self.graphicsView.scene().update_wot(graph)
# if selected member is not the account member...
if person.pubkey != person_account.pubkey:
# add path from selected member to account member
self.get_path_from_member(graph, person, person_account)
# draw graph in qt scene
self.graphicsView.scene().update_wot(graph)
path = self.get_path_from_member(graph, person, person_account)
if path:
self.graphicsView.scene().update_path(path)
def reset(self):
"""
......@@ -181,35 +184,29 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
if person_account.pubkey not in graph_tmp.keys():
# recursively feed graph searching for account node...
self.feed_graph_to_find_account(graph_tmp, graph_tmp[person_selected.pubkey]['nodes'], person_account, list())
print(graph_tmp.keys())
if len(graph_tmp[person_selected.pubkey]['nodes']) > 0:
# calculate path of nodes between person and person_account
path = self.find_shortest_path(graph_tmp, graph_tmp[person_selected.pubkey], graph_tmp[person_account.pubkey])
if path:
for node in path:
print(node['text'])
logging.debug([node['text'] for node in path])
else:
print('no path...')
logging.debug('no wot path')
return path
def feed_graph_to_find_account(self, graph, nodes, person_account, done=list()):
print('feed graph on %d nodes' % len(nodes))
for node in tuple(nodes):
print("len done = %d " % len(done))
if node['id'] in tuple(done):
continue
person_selected = Person(node['text'], node['id'])
certifier_list = person_selected.certifiers_of(self.community)
self.add_certifier_list_to_graph(graph, certifier_list, person_selected, person_account)
if person_account.pubkey in tuple(graph.keys()):
print("ACCOUNT IN CERTFIERS END!")
return False
certified_list = person_selected.certified_by(self.community)
self.add_certified_list_to_graph(graph, certified_list, person_selected, person_account)
if person_account.pubkey in tuple(graph.keys()):
print("ACCOUNT IN CERTIFIED END!")
return False
if node['id'] not in tuple(done):
done.append(node['id'])
......@@ -222,16 +219,13 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
return True
def find_shortest_path(self, graph, start, end, path=list()):
#print('start:', start)
path = path + [start]
if start['id'] == end['id']:
return path
if start['id'] not in graph.keys():
return None
shortest = None
print('scan nodes of ' + start['text'])
for node in tuple(graph[start['id']]['nodes']):
print("try path from node " + node['text'])
if node not in path:
newpath = self.find_shortest_path(graph, node, end, path)
if newpath:
......@@ -281,7 +275,6 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
}
# add arc to certifier
graph[certifier['pubkey']]['arcs'].append(arc)
print("CERTIFIER GRAPH LEN = %d " % len(graph[person.pubkey]['nodes']))
# if certifier node not in person nodes
if graph[certifier['pubkey']] not in tuple(graph[person.pubkey]['nodes']):
# add certifier node to person node
......@@ -337,7 +330,6 @@ class WotTabWidget(QWidget, Ui_WotTabWidget):
if new_arc:
# add arc in graph
graph[person.pubkey]['arcs'].append(arc)
print("CERTIFIED GRAPH LEN = %d " % len(graph[person.pubkey]['nodes']))
# if certified node not in person nodes
if graph[certified['pubkey']] not in tuple(graph[person.pubkey]['nodes']):
# add certified node to person node
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment