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

- in Paint Tool added ability to add multiple zones to paint when Area option is checked and the modifier key is pressed (either CTRL or SHIFT as set in Preferences). Right click of the mouse is an additional way to finish the job.

Browse Source 
- in Paint Tool and NCC Tool, for the Area option, now mouse panning is allowed while adding areas to process
This commit is contained in:
Marius Stanciu
2019-08-23 16:44:41 +03:00
parent 2fbb480f86
commit 23f85b71e9
3 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
flatcamTools/ToolNonCopperClear.py
View File

@@ -378,6 +378,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.first_click = False
self.cursor_pos = None
self.mouse_is_dragging = False
self.addtool_btn.clicked.connect(self.on_tool_add)
self.addtool_entry.returnPressed.connect(self.on_tool_add)
@@ -845,7 +846,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
tooldia = float('%.4f' % float(self.tools_table.item(0, 1).text()))
# To be called after clicking on the plot.
def on_mouse_press(event):
def on_mouse_release(event):
# do paint single only for left mouse clicks
if event.button == 1:
if self.first_click is False:
@@ -884,7 +885,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.first_click = False
return
self.app.plotcanvas.vis_disconnect('mouse_press', on_mouse_press)
self.app.plotcanvas.vis_disconnect('mouse_release', on_mouse_release)
self.app.plotcanvas.vis_disconnect('mouse_move', on_mouse_move)
self.app.plotcanvas.vis_connect('mouse_press', self.app.on_mouse_click_over_plot)
@@ -892,9 +893,9 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.app.plotcanvas.vis_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
self.on_ncc()
elif event.button == 2:
elif event.button == 2 and self.first_click is False and self.mouse_is_dragging is False:
self.first_click = False
self.app.plotcanvas.vis_disconnect('mouse_press', on_mouse_press)
self.app.plotcanvas.vis_disconnect('mouse_release', on_mouse_release)
self.app.plotcanvas.vis_disconnect('mouse_move', on_mouse_move)
self.app.plotcanvas.vis_connect('mouse_press', self.app.on_mouse_click_over_plot)
@@ -908,6 +909,12 @@ class NonCopperClear(FlatCAMTool, Gerber):
curr_pos = self.app.plotcanvas.vispy_canvas.translate_coords(event.pos)
self.app.app_cursor.enabled = False
if event.button == 2:
if event.is_dragging is True:
self.mouse_is_dragging = True
else:
self.mouse_is_dragging = False
if self.app.grid_status() == True:
self.app.app_cursor.enabled = True
# Update cursor
@@ -925,7 +932,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.app.plotcanvas.vis_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
self.app.plotcanvas.vis_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
self.app.plotcanvas.vis_connect('mouse_press', on_mouse_press)
self.app.plotcanvas.vis_connect('mouse_release', on_mouse_release)
self.app.plotcanvas.vis_connect('mouse_move', on_mouse_move)
def on_ncc(self):