pygui: further refactoring around retrieving icon images

daemon/core/gui/graph/graph.py

@@ -17,7 +17,6 @@ from core.gui.graph.enums import GraphMode, ScaleOption
 from core.gui.graph.node import CanvasNode, ShadowNode
 from core.gui.graph.shape import Shape
 from core.gui.graph.shapeutils import ShapeType, is_draw_shape, is_marker
-from core.gui.images import TypeToImage
 
 if TYPE_CHECKING:
     from core.gui.app import Application
@@ -26,7 +25,6 @@ if TYPE_CHECKING:
 
 ZOOM_IN: float = 1.1
 ZOOM_OUT: float = 0.9
-ICON_SIZE: int = 48
 MOVE_NODE_MODES: Set[GraphMode] = {GraphMode.NODE, GraphMode.SELECT}
 MOVE_SHAPE_MODES: Set[GraphMode] = {GraphMode.ANNOTATION, GraphMode.SELECT}
 BACKGROUND_COLOR: str = "#cccccc"
@@ -518,14 +516,6 @@ class CanvasGraph(tk.Canvas):
         if not core_node:
             return
         core_node.canvas = self.id
-        try:
-            image_enum = self.manager.node_draw.image_enum
-            self.manager.node_draw.image = self.app.get_icon(image_enum, ICON_SIZE)
-        except AttributeError:
-            image_file = self.manager.node_draw.image_file
-            self.manager.node_draw.image = self.app.get_custom_icon(
-                image_file, ICON_SIZE
-            )
         node = CanvasNode(self.app, self, x, y, core_node, self.manager.node_draw.image)
         self.nodes[node.id] = node
         self.core.set_canvas_node(core_node, node)
@@ -801,25 +791,14 @@ class CanvasGraph(tk.Canvas):
         self.tag_raise(tags.NODE)
 
     def scale_graph(self) -> None:
-        for nid, canvas_node in self.nodes.items():
-            img = None
-            if nutils.is_custom(canvas_node.core_node):
-                for custom_node in self.app.guiconfig.nodes:
-                    if custom_node.name == canvas_node.core_node.model:
-                        img = self.app.get_custom_icon(custom_node.image, ICON_SIZE)
-            else:
-                image_enum = TypeToImage.get(
-                    canvas_node.core_node.type, canvas_node.core_node.model
-                )
-                img = self.app.get_icon(image_enum, ICON_SIZE)
-
-            self.itemconfig(nid, image=img)
-            canvas_node.image = img
+        for node_id, canvas_node in self.nodes.items():
+            image = nutils.get_icon(canvas_node.core_node, self.app)
+            self.itemconfig(node_id, image=image)
+            canvas_node.image = image
             canvas_node.scale_text()
             canvas_node.scale_antennas()
-
-            for edge_id in self.find_withtag(tags.EDGE):
-                self.itemconfig(edge_id, width=int(EDGE_WIDTH * self.app.app_scale))
+        for edge_id in self.find_withtag(tags.EDGE):
+            self.itemconfig(edge_id, width=int(EDGE_WIDTH * self.app.app_scale))
 
     def get_metadata(self) -> Dict[str, Any]:
         wallpaper_path = None

daemon/core/gui/graph/manager.py

@@ -5,7 +5,6 @@ from tkinter import BooleanVar, messagebox, ttk
 from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, ValuesView
 
 from core.api.grpc.wrappers import Link, LinkType, Node, Session, ThroughputsEvent
-from core.gui import images
 from core.gui import nodeutils as nutils
 from core.gui.graph import tags
 from core.gui.graph.edges import (
@@ -18,7 +17,6 @@ from core.gui.graph.enums import GraphMode
 from core.gui.graph.graph import CanvasGraph
 from core.gui.graph.node import CanvasNode
 from core.gui.graph.shapeutils import ShapeType
-from core.gui.images import ImageEnum
 from core.gui.nodeutils import NodeDraw
 
 if TYPE_CHECKING:
@@ -301,10 +299,7 @@ class CanvasManager:
         canvas_id = core_node.canvas if core_node.canvas > 0 else 1
         logging.info("adding core node canvas(%s): %s", core_node.name, canvas_id)
         canvas = self.get(canvas_id)
-        # if the gui can't find node's image, default to the "edit-node" image
-        image = nutils.get_icon(core_node, self.app.guiconfig, self.app.app_scale)
-        if not image:
-            image = self.app.get_icon(ImageEnum.EDITNODE, images.NODE_SIZE)
+        image = nutils.get_icon(core_node, self.app)
         x = core_node.position.x
         y = core_node.position.y
         node = CanvasNode(self.app, canvas, x, y, core_node, image)

daemon/core/gui/graph/node.py

@@ -95,7 +95,7 @@ class CanvasNode:
     def add_antenna(self) -> None:
         x, y = self.position()
         offset = len(self.antennas) * 8 * self.app.app_scale
-        img = self.app.get_icon(ImageEnum.ANTENNA, images.ANTENNA_SIZE)
+        img = self.app.get_icon(ImageEnum.ANTENNA, width=images.ANTENNA_SIZE)
         antenna_id = self.canvas.create_image(
             x - 16 + offset,
             y - int(23 * self.app.app_scale),
@@ -389,7 +389,7 @@ class CanvasNode:
     def scale_antennas(self) -> None:
         for i in range(len(self.antennas)):
             antenna_id = self.antennas[i]
-            image = self.app.get_icon(ImageEnum.ANTENNA, images.ANTENNA_SIZE)
+            image = self.app.get_icon(ImageEnum.ANTENNA, width=images.ANTENNA_SIZE)
             self.canvas.itemconfig(antenna_id, image=image)
             self.antenna_images[antenna_id] = image
             node_x, node_y = self.canvas.coords(self.id)
@@ -492,7 +492,9 @@ class ShadowNode:
         self.node: "CanvasNode" = node
         self.id: Optional[int] = None
         self.text_id: Optional[int] = None
-        self.image: PhotoImage = self.app.get_icon(ImageEnum.SHADOW, images.NODE_SIZE)
+        self.image: PhotoImage = self.app.get_icon(
+            ImageEnum.SHADOW, width=images.NODE_SIZE
+        )
         self.draw()
         self.setup_bindings()