daemon/gui: added support to configure wireless network for position calculations or not

daemon/core/gui/coreclient.py

@@ -779,6 +779,9 @@ class CoreClient:
         )
         return config
 
+    def get_wireless_config(self, node_id: int) -> Dict[str, ConfigOption]:
+        return self.client.get_wireless_config(self.session.id, node_id)
+
     def get_mobility_config(self, node_id: int) -> Dict[str, ConfigOption]:
         config = self.client.get_mobility_config(self.session.id, node_id)
         logger.debug(

daemon/core/gui/dialogs/wirelessconfig.py

@@ -0,0 +1,55 @@
+import tkinter as tk
+from tkinter import ttk
+from typing import TYPE_CHECKING, Dict, Optional
+
+import grpc
+
+from core.api.grpc.wrappers import ConfigOption, Node
+from core.gui.dialogs.dialog import Dialog
+from core.gui.themes import PADX, PADY
+from core.gui.widgets import ConfigFrame
+
+if TYPE_CHECKING:
+    from core.gui.app import Application
+    from core.gui.graph.node import CanvasNode
+
+
+class WirelessConfigDialog(Dialog):
+    def __init__(self, app: "Application", canvas_node: "CanvasNode"):
+        super().__init__(app, f"Wireless Configuration - {canvas_node.core_node.name}")
+        self.node: Node = canvas_node.core_node
+        self.config_frame: Optional[ConfigFrame] = None
+        self.config: Dict[str, ConfigOption] = {}
+        try:
+            config = self.node.wireless_config
+            if not config:
+                config = self.app.core.get_wireless_config(self.node.id)
+            self.config: Dict[str, ConfigOption] = config
+            self.draw()
+        except grpc.RpcError as e:
+            self.app.show_grpc_exception("Wireless Config Error", e)
+            self.has_error: bool = True
+            self.destroy()
+
+    def draw(self) -> None:
+        self.top.columnconfigure(0, weight=1)
+        self.top.rowconfigure(0, weight=1)
+        self.config_frame = ConfigFrame(self.top, self.app, self.config)
+        self.config_frame.draw_config()
+        self.config_frame.grid(sticky=tk.NSEW, pady=PADY)
+        self.draw_buttons()
+
+    def draw_buttons(self) -> None:
+        frame = ttk.Frame(self.top)
+        frame.grid(sticky=tk.EW)
+        for i in range(2):
+            frame.columnconfigure(i, weight=1)
+        button = ttk.Button(frame, text="Apply", command=self.click_apply)
+        button.grid(row=0, column=0, padx=PADX, sticky=tk.EW)
+        button = ttk.Button(frame, text="Cancel", command=self.destroy)
+        button.grid(row=0, column=1, sticky=tk.EW)
+
+    def click_apply(self) -> None:
+        self.config_frame.parse_config()
+        self.node.wireless_config = self.config
+        self.destroy()

daemon/core/gui/graph/node.py

@@ -16,6 +16,7 @@ from core.gui.dialogs.mobilityconfig import MobilityConfigDialog
 from core.gui.dialogs.nodeconfig import NodeConfigDialog
 from core.gui.dialogs.nodeconfigservice import NodeConfigServiceDialog
 from core.gui.dialogs.nodeservice import NodeServiceDialog
+from core.gui.dialogs.wirelessconfig import WirelessConfigDialog
 from core.gui.dialogs.wlanconfig import WlanConfigDialog
 from core.gui.frames.node import NodeInfoFrame
 from core.gui.graph import tags
@@ -219,6 +220,7 @@ class CanvasNode:
         # clear existing menu
         self.context.delete(0, tk.END)
         is_wlan = self.core_node.type == NodeType.WIRELESS_LAN
+        is_wireless = self.core_node.type == NodeType.WIRELESS
         is_emane = self.core_node.type == NodeType.EMANE
         is_mobility = is_wlan or is_emane
         if self.app.core.is_runtime():
@@ -231,6 +233,10 @@ class CanvasNode:
                 self.context.add_command(
                     label="WLAN Config", command=self.show_wlan_config
                 )
+            if is_wireless:
+                self.context.add_command(
+                    label="Wireless Config", command=self.show_wireless_config
+                )
             if is_mobility and self.core_node.id in self.app.core.mobility_players:
                 self.context.add_command(
                     label="Mobility Player", command=self.show_mobility_player
@@ -268,6 +274,10 @@ class CanvasNode:
                 self.context.add_command(
                     label="WLAN Config", command=self.show_wlan_config
                 )
+            if is_wireless:
+                self.context.add_command(
+                    label="Wireless Config", command=self.show_wireless_config
+                )
             if is_mobility:
                 self.context.add_command(
                     label="Mobility Config", command=self.show_mobility_config
@@ -346,6 +356,10 @@ class CanvasNode:
         dialog = NodeConfigDialog(self.app, self)
         dialog.show()
 
+    def show_wireless_config(self) -> None:
+        dialog = WirelessConfigDialog(self.app, self)
+        dialog.show()
+
     def show_wlan_config(self) -> None:
         dialog = WlanConfigDialog(self.app, self)
         if not dialog.has_error: