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

pygui: refactoring of nodeutils and its usage, fixed issue with drawing custom nodes and copying services

Browse source
This commit is contained in:
Blake Harnden 2021-02-18 10:47:20 -08:00
parent 422a1a500e
commit 47ac4c850d
12 changed files with 194 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/gui/frames/node.py
View file

@ -2,8 +2,8 @@ import tkinter as tk
from typing import TYPE_CHECKING
from core.api.grpc.wrappers import NodeType
from core.gui import nodeutils as nutils
from core.gui.frames.base import DetailsFrame, InfoFrameBase
from core.gui.nodeutils import NodeUtils
if TYPE_CHECKING:
from core.gui.app import Application
@ -22,9 +22,9 @@ class NodeInfoFrame(InfoFrameBase):
frame.grid(sticky=tk.EW)
frame.add_detail("ID", str(node.id))
frame.add_detail("Name", node.name)
if NodeUtils.is_model_node(node):
if nutils.is_model(node):
frame.add_detail("Type", node.model)
if NodeUtils.is_container_node(node):
if nutils.is_container(node):
for index, service in enumerate(sorted(node.services)):
if index == 0:
frame.add_detail("Services", service)
@ -33,8 +33,8 @@ class NodeInfoFrame(InfoFrameBase):
if node.type == NodeType.EMANE:
emane = "".join(node.emane.split("_")[1:])
frame.add_detail("EMANE", emane)
if NodeUtils.is_image_node(node.type):
if nutils.has_image(node.type):
frame.add_detail("Image", node.image)
if NodeUtils.is_container_node(node):
if nutils.is_container(node):
server = node.server if node.server else "localhost"
frame.add_detail("Server", server)