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

consolidated node move logic to one function, used by both node events and node drag

Browse source
This commit is contained in:
Blake Harnden 2019-11-27 13:23:45 -08:00
parent d1db5e4b4e
commit 804b95d486
2 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
coretk/coretk/graph.py
View file

@ -598,17 +598,18 @@ class CanvasNode:
old_y = self.core_node.position.y old_y = self.core_node.position.y
x_offset = x - old_x x_offset = x - old_x
y_offset = y - old_y y_offset = y - old_y
self.core_node.position.x = x self.core_node.position.x = int(x)
self.core_node.position.y = y self.core_node.position.y = int(y)
self.canvas.move(self.id, x_offset, y_offset) self.canvas.move(self.id, x_offset, y_offset)
self.canvas.move(self.text_id, x_offset, y_offset) self.canvas.move(self.text_id, x_offset, y_offset)
self.antenna_draw.update_antennas_position(x_offset, y_offset) self.antenna_draw.update_antennas_position(x_offset, y_offset)
self.canvas.canvas_management.node_drag(self, x_offset, y_offset)
for edge in self.edges: for edge in self.edges:
x1, y1, x2, y2 = self.canvas.coords(edge.id) x1, y1, x2, y2 = self.canvas.coords(edge.id)
if edge.src == self.id: if edge.src == self.id:
self.canvas.coords(edge.id, x_offset, y_offset, x2, y2) self.canvas.coords(edge.id, x, y, x2, y2)
else: else:
self.canvas.coords(edge.id, x1, y1, x_offset, y_offset) self.canvas.coords(edge.id, x1, y1, x, y)
edge.link_info.recalculate_info() edge.link_info.recalculate_info()
self.canvas.helper.update_wlan_connection(old_x, old_y, x, y, self.wlans) self.canvas.helper.update_wlan_connection(old_x, old_y, x, y, self.wlans)
@ -650,32 +651,7 @@ class CanvasNode:
if self.canvas.mode == GraphMode.EDGE or self.canvas.mode == GraphMode.NODE: if self.canvas.mode == GraphMode.EDGE or self.canvas.mode == GraphMode.NODE:
return return
x, y = self.canvas.canvas_xy(event) x, y = self.canvas.canvas_xy(event)
moving_x, moving_y = self.moving self.move(x, y)
offset_x, offset_y = x - moving_x, y - moving_y
self.moving = x, y
old_x, old_y = self.canvas.coords(self.id)
self.canvas.move(self.id, offset_x, offset_y)
self.canvas.move(self.text_id, offset_x, offset_y)
self.antenna_draw.update_antennas_position(offset_x, offset_y)
self.canvas.canvas_management.node_drag(self, offset_x, offset_y)
new_x, new_y = self.canvas.coords(self.id)
if self.canvas.core.is_runtime():
self.canvas.core.edit_node(self.core_node.id, int(new_x), int(new_y))
for edge in self.edges:
x1, y1, x2, y2 = self.canvas.coords(edge.id)
if x1 == old_x and y1 == old_y:
self.canvas.coords(edge.id, new_x, new_y, x2, y2)
else:
self.canvas.coords(edge.id, x1, y1, new_x, new_y)
edge.link_info.recalculate_info()
self.canvas.helper.update_wlan_connection(
old_x, old_y, new_x, new_y, self.wlans
)
def select_multiple(self, event): def select_multiple(self, event):
self.canvas.canvas_management.node_select(self, True) self.canvas.canvas_management.node_select(self, True)

4
coretk/coretk/nodedelete.py
View file

@ -35,7 +35,9 @@ class CanvasComponentManagement:
self.selected[canvas_node.id] = bbox_id self.selected[canvas_node.id] = bbox_id
def node_drag(self, canvas_node, offset_x, offset_y): def node_drag(self, canvas_node, offset_x, offset_y):
self.canvas.move(self.selected[canvas_node.id], offset_x, offset_y) select_id = self.selected.get(canvas_node.id)
if select_id is not None:
self.canvas.move(select_id, offset_x, offset_y)
def delete_current_bbox(self): def delete_current_bbox(self):
for bbid in self.selected.values(): for bbid in self.selected.values():