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

changes to move sdt calls internal to core interactions, which allows it to work with both guis

Browse source
This commit is contained in:
Blake Harnden 2020-02-27 21:39:18 -08:00
parent 20e3fbc7d9
commit 67da3e5c22
3 changed files with 156 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/emulator/session.py
View file

@ -432,6 +432,7 @@ class Session:
if node_two:
node_two.lock.release()
self.sdt.add_link(node_one_id, node_two_id, is_wireless=False)
return node_one_interface, node_two_interface
def delete_link(
@ -540,6 +541,8 @@ class Session:
if node_two:
node_two.lock.release()
self.sdt.delete_link(node_one_id, node_two_id)
def update_link(
self,
node_one_id: int,
@ -757,6 +760,7 @@ class Session:
self.add_remove_control_interface(node=node, remove=False)
self.services.boot_services(node)
self.sdt.add_node(node)
return node
def edit_node(self, node_id: int, options: NodeOptions) -> None:
@ -765,7 +769,7 @@ class Session:
:param node_id: id of node to update
:param options: data to update node with
:return: True if node updated, False otherwise
:return: nothing
:raises core.CoreError: when node to update does not exist
"""
# get node to update
@ -778,6 +782,8 @@ class Session:
node.canvas = options.canvas
node.icon = options.icon
self.sdt.edit_node(node)
def set_node_position(self, node: NodeBase, options: NodeOptions) -> None:
"""
Set position for a node, use lat/lon/alt if needed.
@ -1402,6 +1408,7 @@ class Session:
if node:
node.shutdown()
self.check_shutdown()
self.sdt.delete_node(_id)
return node is not None
@ -1413,6 +1420,7 @@ class Session:
funcs = []
while self.nodes:
_, node = self.nodes.popitem()
self.sdt.delete_node(node.id)
funcs.append((node.shutdown, [], {}))
utils.threadpool(funcs)
self.node_id_gen.id = 0