- fixed mouse cursor to work for all objects
- fixed event signals to work in both graphic engines: 2D and 3D
This commit is contained in:
@@ -780,13 +780,21 @@ class CutOut(FlatCAMTool):
|
||||
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve Geometry object"), name))
|
||||
return "Could not retrieve object: %s" % name
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('key_press', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.on_mouse_move)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.on_mouse_click_release)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.kp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mr)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mm)
|
||||
|
||||
self.kp = self.app.plotcanvas.graph_event_connect('key_press', self.on_key_press)
|
||||
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_mouse_move)
|
||||
self.mr = self.app.plotcanvas.graph_event_connect('mouse_release', self.on_mouse_click_release)
|
||||
|
||||
|
||||
def on_manual_cutout(self, click_pos):
|
||||
name = self.man_object_combo.currentText()
|
||||
@@ -943,13 +951,20 @@ class CutOut(FlatCAMTool):
|
||||
|
||||
# if RMB then we exit
|
||||
elif event.button == 2 and self.mouse_is_dragging is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.kp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mm)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mr)
|
||||
|
||||
self.app.kp = self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
|
||||
# Remove any previous utility shape
|
||||
self.app.geo_editor.tool_shape.clear(update=True)
|
||||
@@ -1064,13 +1079,20 @@ class CutOut(FlatCAMTool):
|
||||
|
||||
# Escape = Deselect All
|
||||
if key == QtCore.Qt.Key_Escape or key == 'Escape':
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('key_press', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.kp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mm)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mr)
|
||||
|
||||
self.app.kp = self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
|
||||
# Remove any previous utility shape
|
||||
self.app.geo_editor.tool_shape.clear(update=True)
|
||||
|
||||
@@ -182,26 +182,49 @@ class Measurement(FlatCAMTool):
|
||||
|
||||
# we can connect the app mouse events to the measurement tool
|
||||
# NEVER DISCONNECT THOSE before connecting some other handlers; it breaks something in VisPy
|
||||
self.canvas.graph_event_connect('mouse_move', self.on_mouse_move_meas)
|
||||
self.canvas.graph_event_connect('mouse_release', self.on_mouse_click_release)
|
||||
self.mm = self.canvas.graph_event_connect('mouse_move', self.on_mouse_move_meas)
|
||||
self.mr = self.canvas.graph_event_connect('mouse_release', self.on_mouse_click_release)
|
||||
|
||||
# we disconnect the mouse/key handlers from wherever the measurement tool was called
|
||||
if self.app.call_source == 'app':
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
if self.app.is_legacy is False:
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
else:
|
||||
self.canvas.graph_event_disconnect(self.app.mm)
|
||||
self.canvas.graph_event_disconnect(self.app.mp)
|
||||
self.canvas.graph_event_disconnect(self.app.mr)
|
||||
|
||||
elif self.app.call_source == 'geo_editor':
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.geo_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.geo_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.geo_editor.on_geo_click_release)
|
||||
if self.app.is_legacy is False:
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.geo_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.geo_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.geo_editor.on_geo_click_release)
|
||||
else:
|
||||
self.canvas.graph_event_disconnect(self.app.geo_editor.mm)
|
||||
self.canvas.graph_event_disconnect(self.app.geo_editor.mp)
|
||||
self.canvas.graph_event_disconnect(self.app.geo_editor.mr)
|
||||
|
||||
elif self.app.call_source == 'exc_editor':
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.exc_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.exc_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.exc_editor.on_exc_click_release)
|
||||
if self.app.is_legacy is False:
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.exc_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.exc_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.exc_editor.on_exc_click_release)
|
||||
else:
|
||||
self.canvas.graph_event_disconnect(self.app.exc_editor.mm)
|
||||
self.canvas.graph_event_disconnect(self.app.exc_editor.mp)
|
||||
self.canvas.graph_event_disconnect(self.app.exc_editor.mr)
|
||||
|
||||
elif self.app.call_source == 'grb_editor':
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.grb_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.grb_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.grb_editor.on_grb_click_release)
|
||||
if self.app.is_legacy is False:
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.app.grb_editor.on_canvas_move)
|
||||
self.canvas.graph_event_disconnect('mouse_press', self.app.grb_editor.on_canvas_click)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.app.grb_editor.on_grb_click_release)
|
||||
else:
|
||||
self.canvas.graph_event_disconnect(self.app.grb_editor.mm)
|
||||
self.canvas.graph_event_disconnect(self.app.grb_editor.mp)
|
||||
self.canvas.graph_event_disconnect(self.app.grb_editor.mr)
|
||||
|
||||
self.app.call_source = 'measurement'
|
||||
|
||||
@@ -214,25 +237,35 @@ class Measurement(FlatCAMTool):
|
||||
|
||||
self.app.call_source = copy(self.original_call_source)
|
||||
if self.original_call_source == 'app':
|
||||
self.canvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.canvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.canvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mm = self.canvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.mp = self.canvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.mr = self.canvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
|
||||
elif self.original_call_source == 'geo_editor':
|
||||
self.canvas.graph_event_connect('mouse_move', self.app.geo_editor.on_canvas_move)
|
||||
self.canvas.graph_event_connect('mouse_press', self.app.geo_editor.on_canvas_click)
|
||||
self.canvas.graph_event_connect('mouse_release', self.app.geo_editor.on_geo_click_release)
|
||||
self.app.geo_editor.mm = self.canvas.graph_event_connect('mouse_move', self.app.geo_editor.on_canvas_move)
|
||||
self.app.geo_editor.mp = self.canvas.graph_event_connect('mouse_press', self.app.geo_editor.on_canvas_click)
|
||||
self.app.geo_editor.mr = self.canvas.graph_event_connect('mouse_release',
|
||||
self.app.geo_editor.on_geo_click_release)
|
||||
|
||||
elif self.original_call_source == 'exc_editor':
|
||||
self.canvas.graph_event_connect('mouse_move', self.app.exc_editor.on_canvas_move)
|
||||
self.canvas.graph_event_connect('mouse_press', self.app.exc_editor.on_canvas_click)
|
||||
self.canvas.graph_event_connect('mouse_release', self.app.exc_editor.on_exc_click_release)
|
||||
self.app.exc_editor.mm = self.canvas.graph_event_connect('mouse_move', self.app.exc_editor.on_canvas_move)
|
||||
self.app.exc_editor.mp = self.canvas.graph_event_connect('mouse_press', self.app.exc_editor.on_canvas_click)
|
||||
self.app.exc_editor.mr = self.canvas.graph_event_connect('mouse_release',
|
||||
self.app.exc_editor.on_exc_click_release)
|
||||
|
||||
elif self.original_call_source == 'grb_editor':
|
||||
self.canvas.graph_event_connect('mouse_move', self.app.grb_editor.on_canvas_move)
|
||||
self.canvas.graph_event_connect('mouse_press', self.app.grb_editor.on_canvas_click)
|
||||
self.canvas.graph_event_connect('mouse_release', self.app.grb_editor.on_grb_click_release)
|
||||
self.app.grb_editor.mm = self.canvas.graph_event_connect('mouse_move', self.app.grb_editor.on_canvas_move)
|
||||
self.app.grb_editor.mp = self.canvas.graph_event_connect('mouse_press', self.app.grb_editor.on_canvas_click)
|
||||
self.app.grb_editor.mr = self.canvas.graph_event_connect('mouse_release',
|
||||
self.app.grb_editor.on_grb_click_release)
|
||||
|
||||
# disconnect the mouse/key events from functions of measurement tool
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.on_mouse_move_meas)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
if self.app.is_legacy is False:
|
||||
self.canvas.graph_event_disconnect('mouse_move', self.on_mouse_move_meas)
|
||||
self.canvas.graph_event_disconnect('mouse_release', self.on_mouse_click_release)
|
||||
else:
|
||||
self.canvas.graph_event_disconnect(self.mm)
|
||||
self.canvas.graph_event_disconnect(self.mr)
|
||||
|
||||
# self.app.ui.notebook.setTabText(2, _("Tools"))
|
||||
# self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab)
|
||||
|
||||
@@ -66,10 +66,16 @@ class ToolMove(FlatCAMTool):
|
||||
if self.isVisible():
|
||||
self.setVisible(False)
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.on_left_click)
|
||||
self.app.plotcanvas.graph_event_disconnect('key_release', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.on_move)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.on_left_click)
|
||||
self.app.plotcanvas.graph_event_disconnect('key_release', self.on_key_press)
|
||||
self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mm)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.kr)
|
||||
self.app.kr = self.app.plotcanvas.graph_event_connect('key_press', self.app.ui.keyPressEvent)
|
||||
|
||||
self.clicked_move = 0
|
||||
|
||||
@@ -99,9 +105,14 @@ class ToolMove(FlatCAMTool):
|
||||
# this is necessary because right mouse click and middle mouse click
|
||||
# are used for panning on the canvas
|
||||
|
||||
if self.app.is_legacy is False:
|
||||
event_pos = event.pos
|
||||
else:
|
||||
event_pos = (event.xdata, event.ydata)
|
||||
|
||||
if event.button == 1:
|
||||
if self.clicked_move == 0:
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event.pos)
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event_pos)
|
||||
|
||||
# if GRID is active we need to get the snapped positions
|
||||
if self.app.grid_status() == True:
|
||||
@@ -118,7 +129,7 @@ class ToolMove(FlatCAMTool):
|
||||
|
||||
if self.clicked_move == 1:
|
||||
try:
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event.pos)
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event_pos)
|
||||
|
||||
# delete the selection bounding box
|
||||
self.delete_shape()
|
||||
@@ -178,7 +189,8 @@ class ToolMove(FlatCAMTool):
|
||||
self.toggle()
|
||||
return
|
||||
|
||||
except TypeError:
|
||||
except TypeError as e:
|
||||
log.debug("ToolMove.on_left_click() --> %s" % str(e))
|
||||
self.app.inform.emit('[ERROR_NOTCL] %s' %
|
||||
_('ToolMove.on_left_click() --> Error when mouse left click.'))
|
||||
return
|
||||
@@ -195,7 +207,12 @@ class ToolMove(FlatCAMTool):
|
||||
self.app.worker_task.emit({'fcn': worker_task, 'params': []})
|
||||
|
||||
def on_move(self, event):
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event.pos)
|
||||
|
||||
if self.app.is_legacy is False:
|
||||
event_pos = event.pos
|
||||
else:
|
||||
event_pos = (event.xdata, event.ydata)
|
||||
pos_canvas = self.app.plotcanvas.translate_coords(event_pos)
|
||||
|
||||
# if GRID is active we need to get the snapped positions
|
||||
if self.app.grid_status() == True:
|
||||
@@ -232,9 +249,9 @@ class ToolMove(FlatCAMTool):
|
||||
self.toggle()
|
||||
else:
|
||||
# if we have an object selected then we can safely activate the mouse events
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.on_move)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.on_left_click)
|
||||
self.app.plotcanvas.graph_event_connect('key_release', self.on_key_press)
|
||||
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_move)
|
||||
self.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.on_left_click)
|
||||
self.kr = self.app.plotcanvas.graph_event_connect('key_release', self.on_key_press)
|
||||
# first get a bounding box to fit all
|
||||
for obj in obj_list:
|
||||
xmin, ymin, xmax, ymax = obj.bounds()
|
||||
|
||||
@@ -1202,16 +1202,24 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
#
|
||||
# self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
# self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
# self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
# self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
# self.app.on_mouse_click_release_over_plot)
|
||||
elif event.button == 2 and self.mouse_is_dragging == False:
|
||||
self.first_click = False
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', on_mouse_move)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', on_mouse_move)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mr)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mm)
|
||||
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press',
|
||||
self.app.on_mouse_click_over_plot)
|
||||
self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move',
|
||||
self.app.on_mouse_move_over_plot)
|
||||
self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
self.app.on_mouse_click_release_over_plot)
|
||||
|
||||
if len(self.sel_rect) == 0:
|
||||
return
|
||||
@@ -1251,13 +1259,17 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
self.app.draw_moving_selection_shape(old_coords=(self.cursor_pos[0], self.cursor_pos[1]),
|
||||
coords=(curr_pos[0], curr_pos[1]),
|
||||
face_alpha=0.0)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mm)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mr)
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', on_mouse_move)
|
||||
self.mr = self.app.plotcanvas.graph_event_connect('mouse_release', on_mouse_release)
|
||||
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', on_mouse_move)
|
||||
elif select_method == 'box':
|
||||
self.bound_obj_name = self.box_combo.currentText()
|
||||
# Get source object.
|
||||
|
||||
@@ -1017,12 +1017,18 @@ class ToolPaint(FlatCAMTool, Gerber):
|
||||
overlap=overlap,
|
||||
connect=connect,
|
||||
contour=contour)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press',
|
||||
self.app.on_mouse_click_over_plot)
|
||||
self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
self.app.on_mouse_click_release_over_plot)
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', doit)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mr)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mp)
|
||||
self.mp = self.app.plotcanvas.graph_event_connect('mouse_press', doit)
|
||||
|
||||
elif select_method == "area":
|
||||
self.app.inform.emit('[WARNING_NOTCL] %s' %
|
||||
@@ -1091,12 +1097,19 @@ class ToolPaint(FlatCAMTool, Gerber):
|
||||
elif event.button == 2 and self.mouse_is_dragging is False:
|
||||
self.first_click = False
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', on_mouse_move)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', on_mouse_move)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mr)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.mm)
|
||||
|
||||
self.app.plotcanvas.graph_event_connect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
self.app.mp = self.app.plotcanvas.graph_event_connect('mouse_press',
|
||||
self.app.on_mouse_click_over_plot)
|
||||
self.app.mm = self.app.plotcanvas.graph_event_connect('mouse_move',
|
||||
self.app.on_mouse_move_over_plot)
|
||||
self.app.mr = self.app.plotcanvas.graph_event_connect('mouse_release',
|
||||
self.app.on_mouse_click_release_over_plot)
|
||||
|
||||
if len(self.sel_rect) == 0:
|
||||
return
|
||||
@@ -1134,12 +1147,17 @@ class ToolPaint(FlatCAMTool, Gerber):
|
||||
coords=(curr_pos[0], curr_pos[1]),
|
||||
face_alpha=0.0)
|
||||
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
if self.app.is_legacy is False:
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
|
||||
self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
|
||||
else:
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mp)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mm)
|
||||
self.app.plotcanvas.graph_event_disconnect(self.app.mr)
|
||||
|
||||
self.app.plotcanvas.graph_event_connect('mouse_release', on_mouse_release)
|
||||
self.app.plotcanvas.graph_event_connect('mouse_move', on_mouse_move)
|
||||
self.mr = self.app.plotcanvas.graph_event_connect('mouse_release', on_mouse_release)
|
||||
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', on_mouse_move)
|
||||
|
||||
elif select_method == 'ref':
|
||||
self.bound_obj_name = self.box_combo.currentText()
|
||||
|
||||
Reference in New Issue
Block a user