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

- Drilling and Milling Tools: added support to choose the GCode for turning On the laser

Browse Source
This commit is contained in:
Marius Stanciu
2023-12-06 21:00:07 +02:00
parent 825a05d538
commit 569a30ee52
33 changed files with 329 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appGUI/preferences/PreferencesUIManager.py
View File

@@ -264,8 +264,8 @@ class PreferencesUIManager(QtCore.QObject):
"geometry_plot_line": self.ui.geo_pref_form.geometry_gen_group.line_color_entry,
# Geometry Options
"geometry_segx": self.ui.geo_pref_form.geometry_adv_opt_group.segx_entry,
"geometry_segy": self.ui.geo_pref_form.geometry_adv_opt_group.segy_entry,
"geometry_seg_x": self.ui.geo_pref_form.geometry_adv_opt_group.seg_x_entry,
"geometry_seg_y": self.ui.geo_pref_form.geometry_adv_opt_group.seg_y_entry,
# Geometry Export
"geometry_dxf_format": self.ui.geo_pref_form.geometry_exp_group.dxf_format_combo,
@@ -374,10 +374,13 @@ class PreferencesUIManager(QtCore.QObject):
"tools_mill_feedrate_rapid": self.ui.plugin_pref_form.tools_mill_group.feedrate_rapid_entry,
"tools_mill_extracut": self.ui.plugin_pref_form.tools_mill_group.extracut_cb,
"tools_mill_extracut_length": self.ui.plugin_pref_form.tools_mill_group.e_cut_entry,
"tools_mill_z_pdepth": self.ui.plugin_pref_form.tools_mill_group.pdepth_entry,
"tools_mill_z_p_depth": self.ui.plugin_pref_form.tools_mill_group.pdepth_entry,
"tools_mill_feedrate_probe": self.ui.plugin_pref_form.tools_mill_group.feedrate_probe_entry,
"tools_mill_spindledir": self.ui.plugin_pref_form.tools_mill_group.spindledir_radio,
"tools_mill_min_power": self.ui.plugin_pref_form.tools_mill_group.las_min_pwr_entry,
"tools_mill_laser_on": self.ui.plugin_pref_form.tools_mill_group.laser_turn_on_combo,
"tools_mill_f_plunge": self.ui.plugin_pref_form.tools_mill_group.fplunge_cb,
"tools_mill_area_exclusion": self.ui.plugin_pref_form.tools_mill_group.exclusion_cb,
@@ -440,10 +443,13 @@ class PreferencesUIManager(QtCore.QObject):
"tools_drill_toolchangexy": self.ui.plugin_pref_form.tools_drill_group.toolchangexy_entry,
"tools_drill_startz": self.ui.plugin_pref_form.tools_drill_group.estartz_entry,
"tools_drill_feedrate_rapid": self.ui.plugin_pref_form.tools_drill_group.feedrate_rapid_entry,
"tools_drill_z_pdepth": self.ui.plugin_pref_form.tools_drill_group.pdepth_entry,
"tools_drill_z_p_depth": self.ui.plugin_pref_form.tools_drill_group.pdepth_entry,
"tools_drill_feedrate_probe": self.ui.plugin_pref_form.tools_drill_group.feedrate_probe_entry,
"tools_drill_spindledir": self.ui.plugin_pref_form.tools_drill_group.spindledir_radio,
"tools_drill_min_power": self.ui.plugin_pref_form.tools_drill_group.las_min_pwr_entry,
"tools_drill_laser_on": self.ui.plugin_pref_form.tools_drill_group.laser_turn_on_combo,
"tools_drill_f_plunge": self.ui.plugin_pref_form.tools_drill_group.fplunge_cb,
"tools_drill_f_retract": self.ui.plugin_pref_form.tools_drill_group.fretract_cb,

36
appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
View File

@@ -40,35 +40,35 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
adv_frame.setLayout(adv_grid)
# Size of trace segment on X axis
segx_label = FCLabel('%s:' % _("Segment X size"))
segx_label.setToolTip(
seg_x_label = FCLabel('%s:' % _("Segment X size"))
seg_x_label.setToolTip(
_("The size of the trace segment on the X axis.\n"
"Useful for auto-leveling.\n"
"A value of 0 means no segmentation on the X axis.")
)
self.segx_entry = FCDoubleSpinner()
self.segx_entry.set_range(0, 99999)
self.segx_entry.set_precision(self.decimals)
self.segx_entry.setSingleStep(0.1)
self.segx_entry.setWrapping(True)
self.seg_x_entry = FCDoubleSpinner()
self.seg_x_entry.set_range(0, 99999)
self.seg_x_entry.set_precision(self.decimals)
self.seg_x_entry.setSingleStep(0.1)
self.seg_x_entry.setWrapping(True)
adv_grid.addWidget(segx_label, 0, 0)
adv_grid.addWidget(self.segx_entry, 0, 1)
adv_grid.addWidget(seg_x_label, 0, 0)
adv_grid.addWidget(self.seg_x_entry, 0, 1)
# Size of trace segment on Y axis
segy_label = FCLabel('%s:' % _("Segment Y size"))
segy_label.setToolTip(
seg_y_label = FCLabel('%s:' % _("Segment Y size"))
seg_y_label.setToolTip(
_("The size of the trace segment on the Y axis.\n"
"Useful for auto-leveling.\n"
"A value of 0 means no segmentation on the Y axis.")
)
self.segy_entry = FCDoubleSpinner()
self.segy_entry.set_range(0, 99999)
self.segy_entry.set_precision(self.decimals)
self.segy_entry.setSingleStep(0.1)
self.segy_entry.setWrapping(True)
self.seg_y_entry = FCDoubleSpinner()
self.seg_y_entry.set_range(0, 99999)
self.seg_y_entry.set_precision(self.decimals)
self.seg_y_entry.setSingleStep(0.1)
self.seg_y_entry.setWrapping(True)
adv_grid.addWidget(segy_label, 2, 0)
adv_grid.addWidget(self.segy_entry, 2, 1)
adv_grid.addWidget(seg_y_label, 2, 0)
adv_grid.addWidget(self.seg_y_entry, 2, 1)
# self.layout.addStretch()

17
appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
View File

@@ -387,6 +387,19 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
adv_grid.addWidget(self.las_min_pwr_label, 14, 0)
adv_grid.addWidget(self.las_min_pwr_entry, 14, 1)
# Laser Turn ON Code
self.laser_turn_on_lbl = FCLabel('%s:' % _('Turn ON Code'))
self.laser_turn_on_lbl.setToolTip(
_("The Gode that will be executed to turn the laser on.")
)
self.laser_turn_on_combo = FCComboBox()
self.laser_turn_on_combo.addItems(["M3", "M4"])
self.laser_turn_on_combo.setObjectName("e_laser_turn_on")
adv_grid.addWidget(self.laser_turn_on_lbl, 16, 0)
adv_grid.addWidget(self.laser_turn_on_combo, 16, 1)
# Fast Plunge
self.fplunge_cb = FCCheckBox('%s' % _('Fast Plunge'))
self.fplunge_cb.setToolTip(
@@ -395,7 +408,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
"meaning the fastest speed available.\n"
"WARNING: the move is done at Toolchange X,Y coords.")
)
adv_grid.addWidget(self.fplunge_cb, 16, 0)
adv_grid.addWidget(self.fplunge_cb, 18, 0)
# Fast retract
self.fretract_cb = FCCheckBox('%s' % _('Fast Retract'))
@@ -408,7 +421,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
"(travel height) is done as fast as possible (G0) in one move.")
)
adv_grid.addWidget(self.fretract_cb, 16, 1, 1, 2)
adv_grid.addWidget(self.fretract_cb, 18, 1, 1, 2)
# separator_line = QtWidgets.QFrame()
# separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)

12
appGUI/preferences/tools/ToolsMillPrefGroupUI.py
View File

@@ -430,6 +430,18 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
)
adv_grid.addWidget(self.fplunge_cb, 16, 0, 1, 2)
# Laser Turn ON Code
self.laser_turn_on_lbl = FCLabel('%s:' % _('Turn ON Code'))
self.laser_turn_on_lbl.setToolTip(
_("The Gode that will be executed to turn the laser on.")
)
self.laser_turn_on_combo = FCComboBox()
self.laser_turn_on_combo.addItems(["M3", "M4"])
adv_grid.addWidget(self.laser_turn_on_lbl, 18, 0)
adv_grid.addWidget(self.laser_turn_on_combo, 18, 1)
# separator_line = QtWidgets.QFrame()
# separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
# separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)