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

- Gerber Editor: added two new tools: Add Disc and Add SemiDisc (porting of Circle and Arc from Geometry Editor)

Browse Source
This commit is contained in:
Marius Stanciu
2019-04-23 04:24:10 +03:00
parent 82a0287f4d
commit 929d70542c
5 changed files with 323 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
flatcamGUI/FlatCAMGUI.py
View File

@@ -472,6 +472,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.grb_convert_poly_menuitem = self.grb_editor_menu.addAction(QtGui.QIcon('share/poligonize32.png'),
_("Poligonize\tALT+N"))
self.grb_add_semidisc_menuitem = self.grb_editor_menu.addAction(QtGui.QIcon('share/semidisc32.png'),
_("Add SemiDisc\tE"))
self.grb_add_disc_menuitem = self.grb_editor_menu.addAction(QtGui.QIcon('share/disc32.png'),
_("Add Disc\tD"))
self.grb_add_buffer_menuitem = self.grb_editor_menu.addAction(QtGui.QIcon('share/buffer16-2.png'),
_('Buffer\tB'))
self.grb_add_scale_menuitem = self.grb_editor_menu.addAction(QtGui.QIcon('share/scale32.png'),
@@ -695,6 +699,9 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/poligonize32.png'),
_("Poligonize"))
self.grb_add_semidisc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/semidisc32.png'), _("SemiDisc"))
self.grb_add_disc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/disc32.png'), _("Disc"))
self.grb_edit_toolbar.addSeparator()
self.aperture_buffer_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/buffer16-2.png'), _('Buffer'))
@@ -1448,6 +1455,14 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
<td height="20"><strong>C</strong></td>
<td>&nbsp;Copy</td>
</tr>
<tr height="20">
<td height="20"><strong>D</strong></td>
<td>&nbsp;Add Disc</td>
</tr>
<tr height="20">
<td height="20"><strong>E</strong></td>
<td>&nbsp;Add SemiDisc</td>
</tr>
<tr height="20">
<td height="20"><strong>J</strong></td>
<td>&nbsp;Jump to Location (x, y)</td>
@@ -2673,6 +2688,18 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to copy."))
return
# Add Disc Tool
if key == QtCore.Qt.Key_D or key == 'D':
self.app.grb_editor.launched_from_shortcuts = True
self.app.grb_editor.select_tool('disc')
return
# Add SemiDisc Tool
if key == QtCore.Qt.Key_E or key == 'E':
self.app.grb_editor.launched_from_shortcuts = True
self.app.grb_editor.select_tool('semidisc')
return
# Grid Snap
if key == QtCore.Qt.Key_G or key == 'G':
self.app.grb_editor.launched_from_shortcuts = True