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

- added a parameter ('Fast plunge' in Edit -> Preferences -> Geometry Options and Excellon Options) to control if the fast move to Z_move is done or not

Browse Source
This commit is contained in:
Marius Stanciu
2019-01-31 13:58:49 +02:00
committed by Marius
parent 965e7f48ed
commit 3c355f72be
9 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
FlatCAMGUI.py
View File

@@ -1972,6 +1972,16 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
self.pp_excellon_name_cb.setFocusPolicy(Qt.StrongFocus)
grid2.addWidget(self.pp_excellon_name_cb, 12, 1)
fplungelabel = QtWidgets.QLabel('Fast Plunge:')
fplungelabel.setToolTip(
"By checking this, the vertical move from\n"
"Z_Toolchange to Z_move is done with G0,\n"
"meaning the fastest speed available."
)
self.fplunge_cb = FCCheckBox()
grid2.addWidget(fplungelabel, 13, 0)
grid2.addWidget(self.fplunge_cb, 13, 1)
#### Choose what to use for Gcode creation: Drills, Slots or Both
excellon_gcode_type_label = QtWidgets.QLabel('<b>Gcode: </b>')
excellon_gcode_type_label.setToolTip(
@@ -1983,8 +1993,8 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
self.excellon_gcode_type_radio = RadioSet([{'label': 'Drills', 'value': 'drills'},
{'label': 'Slots', 'value': 'slots'},
{'label': 'Both', 'value': 'both'}])
grid2.addWidget(excellon_gcode_type_label, 13, 0)
grid2.addWidget(self.excellon_gcode_type_radio, 13, 1)
grid2.addWidget(excellon_gcode_type_label, 14, 0)
grid2.addWidget(self.excellon_gcode_type_radio, 14, 1)
# until I decide to implement this feature those remain disabled
excellon_gcode_type_label.setDisabled(True)
@@ -2268,6 +2278,17 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
self.pp_geometry_name_cb.setFocusPolicy(Qt.StrongFocus)
grid1.addWidget(self.pp_geometry_name_cb, 16, 1)
# Fast Move from Z Toolchange
fplungelabel = QtWidgets.QLabel('Fast Plunge:')
fplungelabel.setToolTip(
"By checking this, the vertical move from\n"
"Z_Toolchange to Z_move is done with G0,\n"
"meaning the fastest speed available."
)
self.fplunge_cb = FCCheckBox()
grid1.addWidget(fplungelabel, 17, 0)
grid1.addWidget(self.fplunge_cb, 17, 1)
# Size of trace segment on X axis
segx_label = QtWidgets.QLabel("Seg. X size:")
segx_label.setToolTip(
@@ -2275,9 +2296,9 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
"Useful for auto-leveling.\n"
"A value of 0 means no segmentation on the X axis."
)
grid1.addWidget(segx_label, 17, 0)
grid1.addWidget(segx_label, 18, 0)
self.segx_entry = FCEntry()
grid1.addWidget(self.segx_entry, 17, 1)
grid1.addWidget(self.segx_entry, 18, 1)
# Size of trace segment on Y axis
segy_label = QtWidgets.QLabel("Seg. Y size:")
@@ -2286,9 +2307,9 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
"Useful for auto-leveling.\n"
"A value of 0 means no segmentation on the Y axis."
)
grid1.addWidget(segy_label, 18, 0)
grid1.addWidget(segy_label, 19, 0)
self.segy_entry = FCEntry()
grid1.addWidget(self.segy_entry, 18, 1)
grid1.addWidget(self.segy_entry, 19, 1)
self.layout.addStretch()