updates to move node context logic to node class and added check to display options the same as old core

coretk/coretk/graph/graph.py

@@ -4,7 +4,6 @@ import tkinter as tk
 from PIL import Image, ImageTk
 
 from core.api.grpc import core_pb2
-from core.api.grpc.core_pb2 import NodeType
 from coretk.dialogs.shapemod import ShapeDialog
 from coretk.graph.edges import CanvasEdge, CanvasWirelessEdge
 from coretk.graph.enums import GraphMode, ScaleOption
@@ -63,40 +62,6 @@ class CanvasGraph(tk.Canvas):
         self.show_grid = tk.BooleanVar(value=True)
         self.adjust_to_dim = tk.BooleanVar(value=False)
 
-    def create_node_context(self, canvas_node):
-        node = canvas_node.core_node
-        context = tk.Menu(self.master)
-        context.add_command(label="Configure", command=canvas_node.show_config)
-        if node.type == NodeType.WIRELESS_LAN:
-            context.add_command(
-                label="WLAN Config", command=canvas_node.show_wlan_config
-            )
-            if self.master.core.is_runtime():
-                if canvas_node.core_node.id in self.master.core.mobility_players:
-                    context.add_command(
-                        label="Mobility Player",
-                        command=canvas_node.show_mobility_player,
-                    )
-            else:
-                context.add_command(
-                    label="Mobility Config", command=canvas_node.show_mobility_config
-                )
-        if node.type == NodeType.EMANE:
-            context.add_command(
-                label="EMANE Config", command=canvas_node.show_emane_config
-            )
-        context.add_command(label="Select adjacent", state=tk.DISABLED)
-        context.add_command(label="Create link to", state=tk.DISABLED)
-        context.add_command(label="Assign to", state=tk.DISABLED)
-        context.add_command(label="Move to", state=tk.DISABLED)
-        context.add_command(label="Cut", state=tk.DISABLED)
-        context.add_command(label="Copy", state=tk.DISABLED)
-        context.add_command(label="Paste", state=tk.DISABLED)
-        context.add_command(label="Delete", state=tk.DISABLED)
-        context.add_command(label="Hide", state=tk.DISABLED)
-        context.add_command(label="Services", state=tk.DISABLED)
-        return context
-
     def reset_and_redraw(self, session):
         """
         Reset the private variables CanvasGraph object, redraw nodes given the new grpc
@@ -512,7 +477,7 @@ class CanvasGraph(tk.Canvas):
             canvas_node = self.nodes.get(selected)
             if canvas_node:
                 logging.debug(f"node context: {selected}")
-                self.context = self.create_node_context(canvas_node)
+                self.context = canvas_node.create_context()
                 self.context.post(event.x_root, event.y_root)
         else:
             self.context.unpost()

coretk/coretk/graph/node.py

@@ -2,6 +2,7 @@ import logging
 import tkinter as tk
 from tkinter import font
 
+from core.api.grpc.core_pb2 import NodeType
 from coretk.dialogs.emaneconfig import EmaneConfigDialog
 from coretk.dialogs.mobilityconfig import MobilityConfigDialog
 from coretk.dialogs.nodeconfig import NodeConfigDialog
@@ -36,6 +37,15 @@ class CanvasNode:
             fill="#0000CD",
         )
         self.tooltip = CanvasTooltip(self.canvas)
+        self.edges = set()
+        self.interfaces = []
+        self.wireless_edges = set()
+        self.moving = None
+        self.antennae = []
+        self.setup_bindings()
+
+    def setup_bindings(self):
+        # self.canvas.bind("<Button-3>", self.click_context)
         self.canvas.tag_bind(self.id, "<ButtonPress-1>", self.click_press)
         self.canvas.tag_bind(self.id, "<ButtonRelease-1>", self.click_release)
         self.canvas.tag_bind(self.id, "<B1-Motion>", self.motion)
@@ -43,11 +53,6 @@ class CanvasNode:
         self.canvas.tag_bind(self.id, "<Control-1>", self.select_multiple)
         self.canvas.tag_bind(self.id, "<Enter>", self.on_enter)
         self.canvas.tag_bind(self.id, "<Leave>", self.on_leave)
-        self.edges = set()
-        self.interfaces = []
-        self.wireless_edges = set()
-        self.moving = None
-        self.antennae = []
 
     def delete(self):
         self.canvas.delete(self.id)
@@ -184,6 +189,51 @@ class CanvasNode:
                 shape = self.canvas.shapes[object_id]
                 shape.motion(None, x - my_x, y - my_y)
 
+    def create_context(self):
+        is_wlan = self.core_node.type == NodeType.WIRELESS_LAN
+        is_emane = self.core_node.type == NodeType.EMANE
+        context = tk.Menu(self.canvas)
+        if self.app.core.is_runtime():
+            context.add_command(label="Configure", command=self.show_config)
+            if is_wlan and self.core_node.id in self.app.core.mobility_players:
+                context.add_command(
+                    label="Mobility Player", command=self.show_mobility_player
+                )
+            context.add_command(label="Select Adjacent", state=tk.DISABLED)
+            context.add_command(label="Hide", state=tk.DISABLED)
+            context.add_command(label="Services", state=tk.DISABLED)
+            if NodeUtils.is_container_node(self.core_node.type):
+                context.add_command(label="Shell Window", state=tk.DISABLED)
+                context.add_command(label="Tcpdump", state=tk.DISABLED)
+                context.add_command(label="Tshark", state=tk.DISABLED)
+                context.add_command(label="Wireshark", state=tk.DISABLED)
+                context.add_command(label="View Log", state=tk.DISABLED)
+        else:
+            context.add_command(label="Configure", command=self.show_config)
+            if is_emane:
+                context.add_command(
+                    label="EMANE Config", command=self.show_emane_config
+                )
+            if is_wlan:
+                context.add_command(label="WLAN Config", command=self.show_wlan_config)
+                context.add_command(
+                    label="Mobility Config", command=self.show_mobility_config
+                )
+            if is_wlan or is_emane:
+                context.add_command(label="Link To All MDRs", state=tk.DISABLED)
+                context.add_command(label="Select Members", state=tk.DISABLED)
+            context.add_command(label="Select Adjacent", state=tk.DISABLED)
+            context.add_command(label="Create Link To", state=tk.DISABLED)
+            context.add_command(label="Assign To", state=tk.DISABLED)
+            context.add_command(label="Move To", state=tk.DISABLED)
+            context.add_command(label="Cut", state=tk.DISABLED)
+            context.add_command(label="Copy", state=tk.DISABLED)
+            context.add_command(label="Paste", state=tk.DISABLED)
+            context.add_command(label="Delete", state=tk.DISABLED)
+            context.add_command(label="Hide", state=tk.DISABLED)
+            context.add_command(label="Services", state=tk.DISABLED)
+        return context
+
     def select_multiple(self, event):
         self.canvas.select_object(self.id, choose_multiple=True)