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

pygui: updates to show wireless edges in details panel, increased edge thickness to be the same as normal edges for selection to be easier

Browse source
This commit is contained in:
Blake Harnden 2020-06-26 09:13:38 -07:00
parent f4224d1b80
commit eac941ce72
3 changed files with 74 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ from core.api.grpc import core_pb2
from core.api.grpc.core_pb2 import Interface, Link
from core.gui import themes
from core.gui.dialogs.linkconfig import LinkConfigurationDialog
from core.gui.frames.link import EdgeInfoFrame
from core.gui.frames.link import EdgeInfoFrame, WirelessEdgeInfoFrame
from core.gui.graph import tags
from core.gui.nodeutils import NodeUtils
from core.gui.utils import bandwidth_text
@ -18,7 +18,7 @@ if TYPE_CHECKING:
TEXT_DISTANCE: float = 0.30
EDGE_WIDTH: int = 3
EDGE_COLOR: str = "#ff0000"
WIRELESS_WIDTH: float = 1.5
WIRELESS_WIDTH: float = 3
WIRELESS_COLOR: str = "#009933"
ARC_DISTANCE: int = 50
@ -241,13 +241,27 @@ class CanvasWirelessEdge(Edge):
src_pos: Tuple[float, float],
dst_pos: Tuple[float, float],
token: Tuple[int, ...],
link: Link,
) -> None:
logging.debug("drawing wireless link from node %s to node %s", src, dst)
super().__init__(canvas, src, dst)
self.link: Link = link
self.token: Tuple[int, ...] = token
self.width: float = WIRELESS_WIDTH
self.color: str = WIRELESS_COLOR
color = link.color if link.color else WIRELESS_COLOR
self.color: str = color
self.draw(src_pos, dst_pos)
if link.label:
self.middle_label_text(link.label)
self.set_binding()
def set_binding(self) -> None:
self.canvas.tag_bind(self.id, "<Button-1>", self.show_info)
def show_info(self, _event: tk.Event) -> None:
self.canvas.app.display_info(
WirelessEdgeInfoFrame, app=self.canvas.app, edge=self
)
class CanvasEdge(Edge):

6
daemon/core/gui/graph/graph.py
View file

@ -233,11 +233,7 @@ class CanvasGraph(tk.Canvas):
return
src_pos = self.coords(src.id)
dst_pos = self.coords(dst.id)
edge = CanvasWirelessEdge(self, src.id, dst.id, src_pos, dst_pos, token)
if link.label:
edge.middle_label_text(link.label)
if link.color:
edge.color = link.color
edge = CanvasWirelessEdge(self, src.id, dst.id, src_pos, dst_pos, token, link)
self.wireless_edges[token] = edge
src.wireless_edges.add(edge)
dst.wireless_edges.add(edge)