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

updates in new gui to allow empty ip4/ip6 addresses, fixed display issues related to empty addresses

Browse source
This commit is contained in:
Blake Harnden 2020-03-04 14:39:28 -08:00
parent d076229973
commit be37f0f279
2 changed files with 45 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,18 +110,20 @@ class CanvasEdge:
def create_labels(self):
label_one = None
if self.link.HasField("interface_one"):
label_one = (
f"{self.link.interface_one.ip4}/{self.link.interface_one.ip4mask}\n"
f"{self.link.interface_one.ip6}/{self.link.interface_one.ip6mask}\n"
)
label_one = self.create_label(self.link.interface_one)
label_two = None
if self.link.HasField("interface_two"):
label_two = (
f"{self.link.interface_two.ip4}/{self.link.interface_two.ip4mask}\n"
f"{self.link.interface_two.ip6}/{self.link.interface_two.ip6mask}\n"
)
label_two = self.create_label(self.link.interface_two)
return label_one, label_two
def create_label(self, interface):
label = ""
if interface.ip4:
label = f"{interface.ip4}/{interface.ip4mask}"
if interface.ip6:
label = f"{label}\n{interface.ip6}/{interface.ip6mask}"
return label
def draw_labels(self):
x1, y1, x2, y2 = self.get_coordinates()
label_one, label_two = self.create_labels()