bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- changed Measuring Tool to use the mouse click release instead of mouse click press; also fixed a bug when using the ESC key.

Browse Source
This commit is contained in:
Marius Stanciu
2019-04-01 00:07:26 +03:00
parent ecd6472220
commit bfd7cbdd44
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
- fixed issue #281 by making generation of a convex shape for the freeform cutout in Tool Cutout a choice rather than the default
- fixed bug in Tool Cutout, now in manual cutout mode the gap size reflect the value set
- changed Measuring Tool to use the mouse click release instead of mouse click press; also fixed a bug when using the ESC key.
29.03.2019

19
flatcamTools/ToolMeasurement.py
View File

@@ -223,6 +223,11 @@ class Measurement(FlatCAMTool):
self.app.exc_editor.canvas.vis_connect('mouse_press', self.app.exc_editor.on_canvas_click)
self.app.exc_editor.canvas.vis_connect('key_press', self.app.exc_editor.on_canvas_key)
self.app.exc_editor.canvas.vis_connect('mouse_release', self.app.exc_editor.on_canvas_click_release)
# elif self.app.call_source == 'grb_editor':
# self.app.grb_editor.canvas.vis_connect('mouse_move', self.app.grb_editor.on_canvas_move)
# self.app.grb_editor.canvas.vis_connect('mouse_press', self.app.grb_editor.on_canvas_click)
# self.app.grb_editor.canvas.vis_connect('key_press', self.app.grb_editor.on_canvas_key)
# self.app.grb_editor.canvas.vis_connect('mouse_release', self.app.grb_editor.on_canvas_click_release)
self.app.call_source = 'measurement'
self.clicked_meas = 0
@@ -251,10 +256,15 @@ class Measurement(FlatCAMTool):
self.app.exc_editor.canvas.vis_disconnect('mouse_press', self.app.exc_editor.on_canvas_click)
self.app.exc_editor.canvas.vis_disconnect('key_press', self.app.exc_editor.on_canvas_key)
self.app.exc_editor.canvas.vis_disconnect('mouse_release', self.app.exc_editor.on_canvas_click_release)
# elif self.app.call_source == 'grb_editor':
# self.app.grb_editor.canvas.vis_disconnect('mouse_move', self.app.grb_editor.on_canvas_move)
# self.app.grb_editor.canvas.vis_disconnect('mouse_press', self.app.grb_editor.on_canvas_click)
# self.app.grb_editor.canvas.vis_disconnect('key_press', self.app.grb_editor.on_canvas_key)
# self.app.grb_editor.canvas.vis_disconnect('mouse_release', self.app.grb_editor.on_canvas_click_release)
# we can safely connect the app mouse events to the measurement tool
self.app.plotcanvas.vis_connect('mouse_move', self.on_mouse_move_meas)
self.app.plotcanvas.vis_connect('mouse_press', self.on_click_meas)
self.app.plotcanvas.vis_connect('mouse_release', self.on_click_meas)
self.app.plotcanvas.vis_connect('key_release', self.on_key_release_meas)
self.app.command_active = "Measurement"
@@ -278,7 +288,8 @@ class Measurement(FlatCAMTool):
def on_key_release_meas(self, event):
if event.key == 'escape':
# abort the measurement action
self.toggle()
self.toggle_f()
self.app.inform.emit("")
return
if event.key == 'G':
@@ -287,8 +298,8 @@ class Measurement(FlatCAMTool):
return
def on_click_meas(self, event):
# mouse click will be accepted only if the left button is clicked
# this is necessary because right mouse click and middle mouse click
# mouse click releases will be accepted only if the left button is clicked
# this is necessary because right mouse click or middle mouse click
# are used for panning on the canvas
if event.button == 1: