afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pygui: fixed issue sorting node ids for edge token to avoid issues with edges defining nodes in a different order

Browse source
This commit is contained in:
Blake Harnden 2021-01-20 10:09:46 -08:00
parent e9bf50b3ff
commit ca004b3e96
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
daemon/core/gui/graph/edges.py
View file

@ -27,13 +27,27 @@ ARC_DISTANCE: int = 50
def create_wireless_token(src: int, dst: int, network: int) -> str: def create_wireless_token(src: int, dst: int, network: int) -> str:
return f"{src}-{dst}-{network}" if src < dst:
node1, node2 = src, dst
else:
node1, node2 = dst, src
return f"{node1}-{node2}-{network}"
def create_edge_token(link: Link) -> str: def create_edge_token(link: Link) -> str:
iface1_id = link.iface1.id if link.iface1 else 0 iface1_id = link.iface1.id if link.iface1 else 0
iface2_id = link.iface2.id if link.iface2 else 0 iface2_id = link.iface2.id if link.iface2 else 0
return f"{link.node1_id}-{iface1_id}-{link.node2_id}-{iface2_id}" if link.node1_id < link.node2_id:
node1 = link.node1_id
node1_iface = iface1_id
node2 = link.node2_id
node2_iface = iface2_id
else:
node1 = link.node2_id
node1_iface = iface2_id
node2 = link.node1_id
node2_iface = iface1_id
return f"{node1}-{node1_iface}-{node2}-{node2_iface}"
def node_label_positions( def node_label_positions(