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

added canvas boundary checks for mouse interactions

Browse source
This commit is contained in:
Blake Harnden 2019-12-12 21:33:51 -08:00
parent d5b2edb6ab
commit fb63d7e8b3
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
coretk/coretk/graph/graph.py
View file

@ -130,6 +130,12 @@ class CanvasGraph(tk.Canvas):
scaled_y = (y * self.ratio) + self.offset[1] scaled_y = (y * self.ratio) + self.offset[1]
return scaled_x, scaled_y return scaled_x, scaled_y
def inside_canvas(self, x, y):
x1, y1, x2, y2 = self.bbox(self.grid)
valid_x = x1 <= x <= x2
valid_y = y1 <= y <= y2
return valid_x and valid_y
def draw_grid(self): def draw_grid(self):
""" """
Create grid. Create grid.
@ -269,13 +275,16 @@ class CanvasGraph(tk.Canvas):
:return: nothing :return: nothing
""" """
logging.debug("click release") logging.debug("click release")
x, y = self.canvas_xy(event)
if not self.inside_canvas(x, y):
return
if self.context: if self.context:
self.context.unpost() self.context.unpost()
self.context = None self.context = None
else: else:
if self.mode == GraphMode.ANNOTATION: if self.mode == GraphMode.ANNOTATION:
self.focus_set() self.focus_set()
x, y = self.canvas_xy(event)
if self.shape_drawing: if self.shape_drawing:
shape = self.shapes[self.selected] shape = self.shapes[self.selected]
shape.shape_complete(x, y) shape.shape_complete(x, y)
@ -302,7 +311,6 @@ class CanvasGraph(tk.Canvas):
if self.mode == GraphMode.EDGE: if self.mode == GraphMode.EDGE:
self.handle_edge_release(event) self.handle_edge_release(event)
elif self.mode == GraphMode.NODE: elif self.mode == GraphMode.NODE:
x, y = self.canvas_xy(event)
self.add_node(x, y) self.add_node(x, y)
elif self.mode == GraphMode.PICKNODE: elif self.mode == GraphMode.PICKNODE:
self.mode = GraphMode.NODE self.mode = GraphMode.NODE
@ -453,6 +461,9 @@ class CanvasGraph(tk.Canvas):
:return: nothing :return: nothing
""" """
x, y = self.canvas_xy(event) x, y = self.canvas_xy(event)
if not self.inside_canvas(x, y):
return
self.cursor = x, y self.cursor = x, y
selected = self.get_selected(event) selected = self.get_selected(event)
logging.debug("click press(%s): %s", self.cursor, selected) logging.debug("click press(%s): %s", self.cursor, selected)
@ -495,6 +506,9 @@ class CanvasGraph(tk.Canvas):
def ctrl_click(self, event): def ctrl_click(self, event):
# update cursor location # update cursor location
x, y = self.canvas_xy(event) x, y = self.canvas_xy(event)
if not self.inside_canvas(x, y):
return
self.cursor = x, y self.cursor = x, y
# handle multiple selections # handle multiple selections
@ -515,6 +529,9 @@ class CanvasGraph(tk.Canvas):
:return: nothing :return: nothing
""" """
x, y = self.canvas_xy(event) x, y = self.canvas_xy(event)
if not self.inside_canvas(x, y):
return
x_offset = x - self.cursor[0] x_offset = x - self.cursor[0]
y_offset = y - self.cursor[1] y_offset = y - self.cursor[1]
self.cursor = x, y self.cursor = x, y
@ -531,7 +548,7 @@ class CanvasGraph(tk.Canvas):
return return
# move selected objects # move selected objects
if len(self.selection) > 0: if self.selection:
for selected_id in self.selection: for selected_id in self.selection:
if selected_id in self.shapes: if selected_id in self.shapes:
shape = self.shapes[selected_id] shape = self.shapes[selected_id]