pygui display error and link to emane docs when attempting to use emane node and it is not installed, fix dialog refactoring breaking mobility player, updated emane docs

daemon/core/gui/coreclient.py

@@ -6,7 +6,7 @@ import logging
 import os
 from pathlib import Path
 from tkinter import messagebox
-from typing import TYPE_CHECKING, Dict, Iterable, List
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional
 
 import grpc
 
@@ -16,6 +16,7 @@ from core.api.grpc.mobility_pb2 import MobilityConfig
 from core.api.grpc.services_pb2 import NodeServiceData, ServiceConfig, ServiceFileConfig
 from core.api.grpc.wlan_pb2 import WlanConfig
 from core.gui import appconfig
+from core.gui.dialogs.emaneinstall import EmaneInstallDialog
 from core.gui.dialogs.error import ErrorDialog
 from core.gui.dialogs.mobilityplayer import MobilityPlayer
 from core.gui.dialogs.sessions import SessionsDialog
@@ -552,7 +553,7 @@ class CoreClient:
                 continue
             if canvas_node.mobility_config:
                 mobility_player = MobilityPlayer(
-                    self.app, self.app, canvas_node, canvas_node.mobility_config
+                    self.app, canvas_node, canvas_node.mobility_config
                 )
                 node_id = canvas_node.core_node.id
                 self.mobility_players[node_id] = mobility_player
@@ -785,7 +786,7 @@ class CoreClient:
 
     def create_node(
         self, x: float, y: float, node_type: core_pb2.NodeType, model: str
-    ) -> core_pb2.Node:
+    ) -> Optional[core_pb2.Node]:
         """
         Add node, with information filled in, to grpc manager
         """
@@ -796,6 +797,10 @@ class CoreClient:
             image = "ubuntu:latest"
         emane = None
         if node_type == core_pb2.NodeType.EMANE:
+            if not self.emane_models:
+                dialog = EmaneInstallDialog(self.app)
+                dialog.show()
+                return
             emane = self.emane_models[0]
             name = f"EMANE{node_id}"
         elif node_type == core_pb2.NodeType.WIRELESS_LAN:
@@ -818,7 +823,7 @@ class CoreClient:
             node.services[:] = services
         # assign default services to CORE node
         else:
-            services = self.default_services.get(model, None)
+            services = self.default_services.get(model)
             if services:
                 node.services[:] = services
         logging.info(

daemon/core/gui/dialogs/emaneinstall.py

@@ -0,0 +1,25 @@
+import webbrowser
+from tkinter import ttk
+
+from core.gui.dialogs.dialog import Dialog
+from core.gui.themes import PADY
+
+
+class EmaneInstallDialog(Dialog):
+    def __init__(self, app) -> None:
+        super().__init__(app, "EMANE Error")
+        self.draw()
+
+    def draw(self):
+        self.top.columnconfigure(0, weight=1)
+        label = ttk.Label(self.top, text="EMANE needs to be installed!")
+        label.grid(sticky="ew", pady=PADY)
+        button = ttk.Button(
+            self.top, text="EMANE Documentation", command=self.click_doc
+        )
+        button.grid(sticky="ew", pady=PADY)
+        button = ttk.Button(self.top, text="Close", command=self.destroy)
+        button.grid(sticky="ew")
+
+    def click_doc(self):
+        webbrowser.open_new("https://coreemu.github.io/core/emane.html")

daemon/core/gui/graph/graph.py

@@ -723,24 +723,26 @@ class CanvasGraph(tk.Canvas):
             dialog = ShapeDialog(self.app, shape)
             dialog.show()
 
-    def add_node(self, x: float, y: float) -> CanvasNode:
-        if self.selected is None or self.selected in self.shapes:
-            actual_x, actual_y = self.get_actual_coords(x, y)
-            core_node = self.core.create_node(
-                actual_x, actual_y, self.node_draw.node_type, self.node_draw.model
+    def add_node(self, x: float, y: float) -> None:
+        if self.selected is not None and self.selected not in self.shapes:
+            return
+        actual_x, actual_y = self.get_actual_coords(x, y)
+        core_node = self.core.create_node(
+            actual_x, actual_y, self.node_draw.node_type, self.node_draw.model
+        )
+        if not core_node:
+            return
+        try:
+            self.node_draw.image = Images.get(
+                self.node_draw.image_enum, int(ICON_SIZE * self.app.app_scale)
             )
-            try:
-                self.node_draw.image = Images.get(
-                    self.node_draw.image_enum, int(ICON_SIZE * self.app.app_scale)
-                )
-            except AttributeError:
-                self.node_draw.image = Images.get_custom(
-                    self.node_draw.image_file, int(ICON_SIZE * self.app.app_scale)
-                )
-            node = CanvasNode(self.app, x, y, core_node, self.node_draw.image)
-            self.core.canvas_nodes[core_node.id] = node
-            self.nodes[node.id] = node
-            return node
+        except AttributeError:
+            self.node_draw.image = Images.get_custom(
+                self.node_draw.image_file, int(ICON_SIZE * self.app.app_scale)
+            )
+        node = CanvasNode(self.app, x, y, core_node, self.node_draw.image)
+        self.core.canvas_nodes[core_node.id] = node
+        self.nodes[node.id] = node
 
     def width_and_height(self):
         """
@@ -925,6 +927,8 @@ class CanvasGraph(tk.Canvas):
             copy = self.core.create_node(
                 actual_x, actual_y, core_node.type, core_node.model
             )
+            if not copy:
+                continue
             node = CanvasNode(self.app, scaled_x, scaled_y, copy, canvas_node.image)
 
             # copy configurations and services