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

renamed coreclient delete graph nodes func

Browse source
This commit is contained in:
bharnden 2019-11-22 15:43:43 -08:00
parent 981be3b7ff
commit 46627aad11
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
coretk/coretk/coreclient.py
View file

@ -57,41 +57,48 @@ class CoreClient:
self.custom_observers = {} self.custom_observers = {}
self.read_config() self.read_config()
# data for managing the current session # helpers
self.canvas_nodes = {}
self.location = None
self.interface_to_edge = {} self.interface_to_edge = {}
self.state = None
self.links = {}
self.hooks = {}
self.id = 1
self.reusable = [] self.reusable = []
self.preexisting = set() self.preexisting = set()
self.interfaces_manager = InterfaceManager(self.app) self.interfaces_manager = InterfaceManager(self.app)
self.created_nodes = set()
self.created_links = set()
# session data
self.id = 1
self.state = None
self.canvas_nodes = {}
self.location = None
self.links = {}
self.hooks = {}
self.wlan_configs = {} self.wlan_configs = {}
self.mobility_configs = {} self.mobility_configs = {}
self.emane_model_configs = {} self.emane_model_configs = {}
self.emane_config = None self.emane_config = None
self.created_nodes = set()
self.created_links = set()
self.service_configs = {} self.service_configs = {}
self.file_configs = {} self.file_configs = {}
def reset(self): def reset(self):
self.id = 1 self.id = 1
# helpers
self.created_nodes.clear()
self.created_links.clear()
self.reusable.clear() self.reusable.clear()
self.preexisting.clear() self.preexisting.clear()
self.interfaces_manager.reset()
self.interface_to_edge.clear()
# session data
self.canvas_nodes.clear() self.canvas_nodes.clear()
self.location = None
self.links.clear() self.links.clear()
self.hooks.clear() self.hooks.clear()
self.wlan_configs.clear() self.wlan_configs.clear()
self.mobility_configs.clear() self.mobility_configs.clear()
self.emane_model_configs.clear()
self.emane_config = None self.emane_config = None
self.location = None
self.service_configs.clear() self.service_configs.clear()
self.file_configs.clear() self.file_configs.clear()
self.interfaces_manager.reset()
self.interface_to_edge.clear()
def set_observer(self, value): def set_observer(self, value):
self.observer = value self.observer = value
@ -462,7 +469,7 @@ class CoreClient:
) )
return node return node
def delete_wanted_graph_nodes(self, node_ids, edge_tokens): def delete_graph_nodes(self, node_ids, edge_tokens):
""" """
remove the nodes selected by the user and anything related to that node remove the nodes selected by the user and anything related to that node
such as link, configurations, interfaces such as link, configurations, interfaces

2
coretk/coretk/graph.py
View file

@ -411,7 +411,7 @@ class CanvasGraph(tk.Canvas):
self.nodes[nid].edges.remove(edge) self.nodes[nid].edges.remove(edge)
# delete the related data from core # delete the related data from core
self.core.delete_wanted_graph_nodes(node_ids, to_delete_edge_tokens) self.core.delete_graph_nodes(node_ids, to_delete_edge_tokens)
def add_node(self, x, y): def add_node(self, x, y):
plot_id = self.find_all()[0] plot_id = self.find_all()[0]