- Tool Drilling - moved some of the Excellon Preferences related to drilling operation to it's own group Drilling Tool Options
- optimized the CNCJob UI to look like other parts of the app
This commit is contained in:
Marius Stanciu
@@ -194,23 +194,8 @@ class PreferencesUIManager:
|
||||
|
||||
"excellon_milling_dia": self.ui.excellon_defaults_form.excellon_opt_group.mill_dia_entry,
|
||||
|
||||
"excellon_cutz": self.ui.excellon_defaults_form.excellon_opt_group.cutz_entry,
|
||||
"excellon_multidepth": self.ui.excellon_defaults_form.excellon_opt_group.mpass_cb,
|
||||
"excellon_depthperpass": self.ui.excellon_defaults_form.excellon_opt_group.maxdepth_entry,
|
||||
"excellon_travelz": self.ui.excellon_defaults_form.excellon_opt_group.travelz_entry,
|
||||
"excellon_endz": self.ui.excellon_defaults_form.excellon_opt_group.endz_entry,
|
||||
"excellon_endxy": self.ui.excellon_defaults_form.excellon_opt_group.endxy_entry,
|
||||
|
||||
"excellon_feedrate_z": self.ui.excellon_defaults_form.excellon_opt_group.feedrate_z_entry,
|
||||
"excellon_spindlespeed": self.ui.excellon_defaults_form.excellon_opt_group.spindlespeed_entry,
|
||||
"excellon_dwell": self.ui.excellon_defaults_form.excellon_opt_group.dwell_cb,
|
||||
"excellon_dwelltime": self.ui.excellon_defaults_form.excellon_opt_group.dwelltime_entry,
|
||||
"excellon_toolchange": self.ui.excellon_defaults_form.excellon_opt_group.toolchange_cb,
|
||||
"excellon_toolchangez": self.ui.excellon_defaults_form.excellon_opt_group.toolchangez_entry,
|
||||
"excellon_ppname_e": self.ui.excellon_defaults_form.excellon_opt_group.pp_excellon_name_cb,
|
||||
"excellon_tooldia": self.ui.excellon_defaults_form.excellon_opt_group.tooldia_entry,
|
||||
"excellon_slot_tooldia": self.ui.excellon_defaults_form.excellon_opt_group.slot_tooldia_entry,
|
||||
"excellon_gcode_type": self.ui.excellon_defaults_form.excellon_opt_group.excellon_gcode_type_radio,
|
||||
|
||||
# Excellon Advanced Options
|
||||
"excellon_offset": self.ui.excellon_defaults_form.excellon_adv_opt_group.offset_entry,
|
||||
@@ -222,9 +207,6 @@ class PreferencesUIManager:
|
||||
"excellon_spindledir": self.ui.excellon_defaults_form.excellon_adv_opt_group.spindledir_radio,
|
||||
"excellon_f_plunge": self.ui.excellon_defaults_form.excellon_adv_opt_group.fplunge_cb,
|
||||
"excellon_f_retract": self.ui.excellon_defaults_form.excellon_adv_opt_group.fretract_cb,
|
||||
"excellon_drill_slots": self.ui.excellon_defaults_form.excellon_adv_opt_group.drill_slots_cb,
|
||||
"excellon_drill_overlap": self.ui.excellon_defaults_form.excellon_adv_opt_group.drill_overlap_entry,
|
||||
"excellon_last_drill": self.ui.excellon_defaults_form.excellon_adv_opt_group.last_drill_cb,
|
||||
|
||||
# Excellon Export
|
||||
"excellon_exp_units": self.ui.excellon_defaults_form.excellon_exp_group.excellon_units_radio,
|
||||
@@ -355,10 +337,31 @@ class PreferencesUIManager:
|
||||
"tools_iso_isoexcept": self.ui.tools_defaults_form.tools_iso_group.except_cb,
|
||||
"tools_iso_selection": self.ui.tools_defaults_form.tools_iso_group.select_combo,
|
||||
"tools_iso_poly_ints": self.ui.tools_defaults_form.tools_iso_group.poly_int_cb,
|
||||
"tools_iso_force": self.ui.tools_defaults_form.tools_iso_group.force_iso_cb,
|
||||
"tools_iso_force": self.ui.tools_defaults_form.tools_iso_group.force_iso_cb,
|
||||
"tools_iso_area_shape": self.ui.tools_defaults_form.tools_iso_group.area_shape_radio,
|
||||
"tools_iso_plotting": self.ui.tools_defaults_form.tools_iso_group.plotting_radio,
|
||||
|
||||
# Drilling Tool
|
||||
"tools_drill_tool_order": self.ui.tools_defaults_form.tools_drill_group.order_radio,
|
||||
"tools_drill_cutz": self.ui.tools_defaults_form.tools_drill_group.cutz_entry,
|
||||
"tools_drill_multidepth": self.ui.tools_defaults_form.tools_drill_group.mpass_cb,
|
||||
"tools_drill_depthperpass": self.ui.tools_defaults_form.tools_drill_group.maxdepth_entry,
|
||||
"tools_drill_travelz": self.ui.tools_defaults_form.tools_drill_group.travelz_entry,
|
||||
"tools_drill_endz": self.ui.tools_defaults_form.tools_drill_group.endz_entry,
|
||||
"tools_drill_endxy": self.ui.tools_defaults_form.tools_drill_group.endxy_entry,
|
||||
|
||||
"tools_drill_feedrate_z": self.ui.tools_defaults_form.tools_drill_group.feedrate_z_entry,
|
||||
"tools_drill_spindlespeed": self.ui.tools_defaults_form.tools_drill_group.spindlespeed_entry,
|
||||
"tools_drill_dwell": self.ui.tools_defaults_form.tools_drill_group.dwell_cb,
|
||||
"tools_drill_dwelltime": self.ui.tools_defaults_form.tools_drill_group.dwelltime_entry,
|
||||
"tools_drill_toolchange": self.ui.tools_defaults_form.tools_drill_group.toolchange_cb,
|
||||
"tools_drill_toolchangez": self.ui.tools_defaults_form.tools_drill_group.toolchangez_entry,
|
||||
"tools_drill_ppname_e": self.ui.tools_defaults_form.tools_drill_group.pp_excellon_name_cb,
|
||||
|
||||
"tools_drill_drill_slots": self.ui.tools_defaults_form.tools_drill_group.drill_slots_cb,
|
||||
"tools_drill_drill_overlap": self.ui.tools_defaults_form.tools_drill_group.drill_overlap_entry,
|
||||
"tools_drill_last_drill": self.ui.tools_defaults_form.tools_drill_group.last_drill_cb,
|
||||
|
||||
# NCC Tool
|
||||
"tools_ncctools": self.ui.tools_defaults_form.tools_ncc_group.ncc_tool_dia_entry,
|
||||
"tools_nccorder": self.ui.tools_defaults_form.tools_ncc_group.ncc_order_radio,
|
||||
|
||||
@@ -152,42 +152,4 @@ class ExcellonAdvOptPrefGroupUI(OptionsGroupUI):
|
||||
|
||||
grid1.addWidget(self.fretract_cb, 8, 0, 1, 2)
|
||||
|
||||
separator_line = QtWidgets.QFrame()
|
||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||
grid1.addWidget(separator_line, 9, 0, 1, 2)
|
||||
|
||||
# DRILL SLOTS LABEL
|
||||
self.dslots_label = QtWidgets.QLabel('<b>%s:</b>' % _('Drilling Slots'))
|
||||
grid1.addWidget(self.dslots_label, 10, 0, 1, 2)
|
||||
|
||||
# Drill slots
|
||||
self.drill_slots_cb = FCCheckBox('%s' % _('Drill slots'))
|
||||
self.drill_slots_cb.setToolTip(
|
||||
_("If the selected tool has slots then they will be drilled.")
|
||||
)
|
||||
grid1.addWidget(self.drill_slots_cb, 11, 0, 1, 2)
|
||||
|
||||
# Drill Overlap
|
||||
self.drill_overlap_label = QtWidgets.QLabel('%s:' % _('Overlap'))
|
||||
self.drill_overlap_label.setToolTip(
|
||||
_("How much (percentage) of the tool diameter to overlap previous drill hole.")
|
||||
)
|
||||
|
||||
self.drill_overlap_entry = FCDoubleSpinner()
|
||||
self.drill_overlap_entry.set_precision(self.decimals)
|
||||
self.drill_overlap_entry.set_range(0.0, 9999.9999)
|
||||
self.drill_overlap_entry.setSingleStep(0.1)
|
||||
|
||||
grid1.addWidget(self.drill_overlap_label, 12, 0)
|
||||
grid1.addWidget(self.drill_overlap_entry, 12, 1)
|
||||
|
||||
# Last drill in slot
|
||||
self.last_drill_cb = FCCheckBox('%s' % _('Last drill'))
|
||||
self.last_drill_cb.setToolTip(
|
||||
_("If the slot length is not completely covered by drill holes,\n"
|
||||
"add a drill hole on the slot end point.")
|
||||
)
|
||||
grid1.addWidget(self.last_drill_cb, 14, 0, 1, 2)
|
||||
|
||||
self.layout.addStretch()
|
||||
|
||||
@@ -89,201 +89,6 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
|
||||
grid2.addWidget(self.mill_dia_label, 2, 0)
|
||||
grid2.addWidget(self.mill_dia_entry, 2, 1)
|
||||
|
||||
# Cut Z
|
||||
cutzlabel = QtWidgets.QLabel('%s:' % _('Cut Z'))
|
||||
cutzlabel.setToolTip(
|
||||
_("Drill depth (negative)\n"
|
||||
"below the copper surface.")
|
||||
)
|
||||
|
||||
self.cutz_entry = FCDoubleSpinner()
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.cutz_entry.set_range(-9999.9999, 0.0000)
|
||||
else:
|
||||
self.cutz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
self.cutz_entry.setSingleStep(0.1)
|
||||
self.cutz_entry.set_precision(self.decimals)
|
||||
|
||||
grid2.addWidget(cutzlabel, 3, 0)
|
||||
grid2.addWidget(self.cutz_entry, 3, 1)
|
||||
|
||||
# Multi-Depth
|
||||
self.mpass_cb = FCCheckBox('%s:' % _("Multi-Depth"))
|
||||
self.mpass_cb.setToolTip(
|
||||
_(
|
||||
"Use multiple passes to limit\n"
|
||||
"the cut depth in each pass. Will\n"
|
||||
"cut multiple times until Cut Z is\n"
|
||||
"reached."
|
||||
)
|
||||
)
|
||||
|
||||
self.maxdepth_entry = FCDoubleSpinner()
|
||||
self.maxdepth_entry.set_precision(self.decimals)
|
||||
self.maxdepth_entry.set_range(0, 9999.9999)
|
||||
self.maxdepth_entry.setSingleStep(0.1)
|
||||
|
||||
self.maxdepth_entry.setToolTip(_("Depth of each pass (positive)."))
|
||||
|
||||
grid2.addWidget(self.mpass_cb, 4, 0)
|
||||
grid2.addWidget(self.maxdepth_entry, 4, 1)
|
||||
|
||||
# Travel Z
|
||||
travelzlabel = QtWidgets.QLabel('%s:' % _('Travel Z'))
|
||||
travelzlabel.setToolTip(
|
||||
_("Tool height when travelling\n"
|
||||
"across the XY plane.")
|
||||
)
|
||||
|
||||
self.travelz_entry = FCDoubleSpinner()
|
||||
self.travelz_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.travelz_entry.set_range(0.0001, 9999.9999)
|
||||
else:
|
||||
self.travelz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid2.addWidget(travelzlabel, 5, 0)
|
||||
grid2.addWidget(self.travelz_entry, 5, 1)
|
||||
|
||||
# Tool change:
|
||||
self.toolchange_cb = FCCheckBox('%s' % _("Tool change"))
|
||||
self.toolchange_cb.setToolTip(
|
||||
_("Include tool-change sequence\n"
|
||||
"in G-Code (Pause for tool change).")
|
||||
)
|
||||
grid2.addWidget(self.toolchange_cb, 6, 0, 1, 2)
|
||||
|
||||
# Tool Change Z
|
||||
toolchangezlabel = QtWidgets.QLabel('%s:' % _('Toolchange Z'))
|
||||
toolchangezlabel.setToolTip(
|
||||
_("Z-axis position (height) for\n"
|
||||
"tool change.")
|
||||
)
|
||||
|
||||
self.toolchangez_entry = FCDoubleSpinner()
|
||||
self.toolchangez_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.toolchangez_entry.set_range(0.0001, 9999.9999)
|
||||
else:
|
||||
self.toolchangez_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid2.addWidget(toolchangezlabel, 7, 0)
|
||||
grid2.addWidget(self.toolchangez_entry, 7, 1)
|
||||
|
||||
# End Move Z
|
||||
endz_label = QtWidgets.QLabel('%s:' % _('End move Z'))
|
||||
endz_label.setToolTip(
|
||||
_("Height of the tool after\n"
|
||||
"the last move at the end of the job.")
|
||||
)
|
||||
self.endz_entry = FCDoubleSpinner()
|
||||
self.endz_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.endz_entry.set_range(0.0000, 9999.9999)
|
||||
else:
|
||||
self.endz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid2.addWidget(endz_label, 8, 0)
|
||||
grid2.addWidget(self.endz_entry, 8, 1)
|
||||
|
||||
# End Move X,Y
|
||||
endmove_xy_label = QtWidgets.QLabel('%s:' % _('End move X,Y'))
|
||||
endmove_xy_label.setToolTip(
|
||||
_("End move X,Y position. In format (x,y).\n"
|
||||
"If no value is entered then there is no move\n"
|
||||
"on X,Y plane at the end of the job.")
|
||||
)
|
||||
self.endxy_entry = NumericalEvalTupleEntry(border_color='#0069A9')
|
||||
|
||||
grid2.addWidget(endmove_xy_label, 9, 0)
|
||||
grid2.addWidget(self.endxy_entry, 9, 1)
|
||||
|
||||
# Feedrate Z
|
||||
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate Z'))
|
||||
frlabel.setToolTip(
|
||||
_("Tool speed while drilling\n"
|
||||
"(in units per minute).\n"
|
||||
"So called 'Plunge' feedrate.\n"
|
||||
"This is for linear move G01.")
|
||||
)
|
||||
self.feedrate_z_entry = FCDoubleSpinner()
|
||||
self.feedrate_z_entry.set_precision(self.decimals)
|
||||
self.feedrate_z_entry.set_range(0, 99999.9999)
|
||||
|
||||
grid2.addWidget(frlabel, 10, 0)
|
||||
grid2.addWidget(self.feedrate_z_entry, 10, 1)
|
||||
|
||||
# Spindle speed
|
||||
spdlabel = QtWidgets.QLabel('%s:' % _('Spindle Speed'))
|
||||
spdlabel.setToolTip(
|
||||
_("Speed of the spindle\n"
|
||||
"in RPM (optional)")
|
||||
)
|
||||
|
||||
self.spindlespeed_entry = FCSpinner()
|
||||
self.spindlespeed_entry.set_range(0, 1000000)
|
||||
self.spindlespeed_entry.set_step(100)
|
||||
|
||||
grid2.addWidget(spdlabel, 11, 0)
|
||||
grid2.addWidget(self.spindlespeed_entry, 11, 1)
|
||||
|
||||
# Dwell
|
||||
self.dwell_cb = FCCheckBox('%s' % _('Enable Dwell'))
|
||||
self.dwell_cb .setToolTip(
|
||||
_("Pause to allow the spindle to reach its\n"
|
||||
"speed before cutting.")
|
||||
)
|
||||
|
||||
grid2.addWidget(self.dwell_cb, 12, 0, 1, 2)
|
||||
|
||||
# Dwell Time
|
||||
dwelltime = QtWidgets.QLabel('%s:' % _('Duration'))
|
||||
dwelltime.setToolTip(_("Number of time units for spindle to dwell."))
|
||||
self.dwelltime_entry = FCDoubleSpinner()
|
||||
self.dwelltime_entry.set_precision(self.decimals)
|
||||
self.dwelltime_entry.set_range(0, 99999.9999)
|
||||
|
||||
grid2.addWidget(dwelltime, 13, 0)
|
||||
grid2.addWidget(self.dwelltime_entry, 13, 1)
|
||||
|
||||
self.ois_dwell_exc = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry])
|
||||
|
||||
# preprocessor selection
|
||||
pp_excellon_label = QtWidgets.QLabel('%s:' % _("Preprocessor"))
|
||||
pp_excellon_label.setToolTip(
|
||||
_("The preprocessor JSON file that dictates\n"
|
||||
"Gcode output.")
|
||||
)
|
||||
|
||||
self.pp_excellon_name_cb = FCComboBox()
|
||||
self.pp_excellon_name_cb.setFocusPolicy(Qt.StrongFocus)
|
||||
|
||||
grid2.addWidget(pp_excellon_label, 14, 0)
|
||||
grid2.addWidget(self.pp_excellon_name_cb, 14, 1)
|
||||
|
||||
# ### Choose what to use for Gcode creation: Drills, Slots or Both
|
||||
excellon_gcode_type_label = QtWidgets.QLabel('<b>%s</b>' % _('Gcode'))
|
||||
excellon_gcode_type_label.setToolTip(
|
||||
_("Choose what to use for GCode generation:\n"
|
||||
"'Drills', 'Slots' or 'Both'.\n"
|
||||
"When choosing 'Slots' or 'Both', slots will be\n"
|
||||
"converted to drills.")
|
||||
)
|
||||
self.excellon_gcode_type_radio = RadioSet([{'label': 'Drills', 'value': 'drills'},
|
||||
{'label': 'Slots', 'value': 'slots'},
|
||||
{'label': 'Both', 'value': 'both'}])
|
||||
grid2.addWidget(excellon_gcode_type_label, 15, 0)
|
||||
grid2.addWidget(self.excellon_gcode_type_radio, 15, 1)
|
||||
|
||||
# until I decide to implement this feature those remain disabled
|
||||
excellon_gcode_type_label.hide()
|
||||
self.excellon_gcode_type_radio.setVisible(False)
|
||||
|
||||
# ### Milling Holes ## ##
|
||||
self.mill_hole_label = QtWidgets.QLabel('<b>%s</b>' % _('Mill Holes'))
|
||||
self.mill_hole_label.setToolTip(
|
||||
|
||||
@@ -71,8 +71,11 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
|
||||
_("Mirror vertically (X) or horizontally (Y).")
|
||||
)
|
||||
|
||||
self.empty_lb1 = QtWidgets.QLabel("")
|
||||
grid0.addWidget(self.empty_lb1, 2, 0)
|
||||
separator_line = QtWidgets.QFrame()
|
||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||
grid0.addWidget(separator_line, 2, 0, 1, 2)
|
||||
|
||||
grid0.addWidget(self.mirax_label, 3, 0)
|
||||
grid0.addWidget(self.mirror_axis_radio, 3, 1)
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
|
||||
gaps_items = ['None', 'LR', 'TB', '4', '2LR', '2TB', '8']
|
||||
for it in gaps_items:
|
||||
self.gaps_combo.addItem(it)
|
||||
self.gaps_combo.setStyleSheet('background-color: rgb(255,255,255)')
|
||||
# self.gaps_combo.setStyleSheet('background-color: rgb(255,255,255)')
|
||||
|
||||
# Surrounding convex box shape
|
||||
self.convex_box = FCCheckBox('%s' % _("Convex Shape"))
|
||||
|
||||
271
appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
Normal file
271
appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
Normal file
@@ -0,0 +1,271 @@
|
||||
from PyQt5 import QtWidgets
|
||||
from PyQt5.QtCore import QSettings, Qt
|
||||
|
||||
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
|
||||
OptionalInputSection
|
||||
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
|
||||
|
||||
import gettext
|
||||
import appTranslation as fcTranslate
|
||||
import builtins
|
||||
|
||||
fcTranslate.apply_language('strings')
|
||||
if '_' not in builtins.__dict__:
|
||||
_ = gettext.gettext
|
||||
|
||||
settings = QSettings("Open Source", "FlatCAM")
|
||||
if settings.contains("machinist"):
|
||||
machinist_setting = settings.value('machinist', type=int)
|
||||
else:
|
||||
machinist_setting = 0
|
||||
|
||||
|
||||
class ToolsDrillPrefGroupUI(OptionsGroupUI):
|
||||
def __init__(self, decimals=4, parent=None):
|
||||
super(ToolsDrillPrefGroupUI, self).__init__(self, parent=parent)
|
||||
|
||||
self.setTitle(str(_("Drilling Tool Options")))
|
||||
self.decimals = decimals
|
||||
|
||||
# ## Clear non-copper regions
|
||||
self.drill_label = QtWidgets.QLabel("<b>%s:</b>" % _("Parameters"))
|
||||
self.drill_label.setToolTip(
|
||||
_("Create CNCJob with toolpaths for drilling or milling holes.")
|
||||
)
|
||||
self.layout.addWidget(self.drill_label)
|
||||
|
||||
grid0 = QtWidgets.QGridLayout()
|
||||
self.layout.addLayout(grid0)
|
||||
|
||||
# Tool order Radio Button
|
||||
self.order_label = QtWidgets.QLabel('%s:' % _('Tool order'))
|
||||
self.order_label.setToolTip(_("This set the way that the tools in the tools table are used.\n"
|
||||
"'No' --> means that the used order is the one in the tool table\n"
|
||||
"'Forward' --> means that the tools will be ordered from small to big\n"
|
||||
"'Reverse' --> means that the tools will ordered from big to small\n\n"
|
||||
"WARNING: using rest machining will automatically set the order\n"
|
||||
"in reverse and disable this control."))
|
||||
|
||||
self.order_radio = RadioSet([{'label': _('No'), 'value': 'no'},
|
||||
{'label': _('Forward'), 'value': 'fwd'},
|
||||
{'label': _('Reverse'), 'value': 'rev'}])
|
||||
|
||||
grid0.addWidget(self.order_label, 1, 0)
|
||||
grid0.addWidget(self.order_radio, 1, 1, 1, 2)
|
||||
|
||||
# Cut Z
|
||||
cutzlabel = QtWidgets.QLabel('%s:' % _('Cut Z'))
|
||||
cutzlabel.setToolTip(
|
||||
_("Drill depth (negative)\n"
|
||||
"below the copper surface.")
|
||||
)
|
||||
|
||||
self.cutz_entry = FCDoubleSpinner()
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.cutz_entry.set_range(-9999.9999, 0.0000)
|
||||
else:
|
||||
self.cutz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
self.cutz_entry.setSingleStep(0.1)
|
||||
self.cutz_entry.set_precision(self.decimals)
|
||||
|
||||
grid0.addWidget(cutzlabel, 3, 0)
|
||||
grid0.addWidget(self.cutz_entry, 3, 1, 1, 2)
|
||||
|
||||
# Multi-Depth
|
||||
self.mpass_cb = FCCheckBox('%s:' % _("Multi-Depth"))
|
||||
self.mpass_cb.setToolTip(
|
||||
_(
|
||||
"Use multiple passes to limit\n"
|
||||
"the cut depth in each pass. Will\n"
|
||||
"cut multiple times until Cut Z is\n"
|
||||
"reached."
|
||||
)
|
||||
)
|
||||
|
||||
self.maxdepth_entry = FCDoubleSpinner()
|
||||
self.maxdepth_entry.set_precision(self.decimals)
|
||||
self.maxdepth_entry.set_range(0, 9999.9999)
|
||||
self.maxdepth_entry.setSingleStep(0.1)
|
||||
|
||||
self.maxdepth_entry.setToolTip(_("Depth of each pass (positive)."))
|
||||
|
||||
grid0.addWidget(self.mpass_cb, 4, 0)
|
||||
grid0.addWidget(self.maxdepth_entry, 4, 1, 1, 2)
|
||||
|
||||
# Travel Z
|
||||
travelzlabel = QtWidgets.QLabel('%s:' % _('Travel Z'))
|
||||
travelzlabel.setToolTip(
|
||||
_("Tool height when travelling\n"
|
||||
"across the XY plane.")
|
||||
)
|
||||
|
||||
self.travelz_entry = FCDoubleSpinner()
|
||||
self.travelz_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.travelz_entry.set_range(0.0001, 9999.9999)
|
||||
else:
|
||||
self.travelz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid0.addWidget(travelzlabel, 5, 0)
|
||||
grid0.addWidget(self.travelz_entry, 5, 1, 1, 2)
|
||||
|
||||
# Tool change:
|
||||
self.toolchange_cb = FCCheckBox('%s' % _("Tool change"))
|
||||
self.toolchange_cb.setToolTip(
|
||||
_("Include tool-change sequence\n"
|
||||
"in G-Code (Pause for tool change).")
|
||||
)
|
||||
grid0.addWidget(self.toolchange_cb, 6, 0, 1, 3)
|
||||
|
||||
# Tool Change Z
|
||||
toolchangezlabel = QtWidgets.QLabel('%s:' % _('Toolchange Z'))
|
||||
toolchangezlabel.setToolTip(
|
||||
_("Z-axis position (height) for\n"
|
||||
"tool change.")
|
||||
)
|
||||
|
||||
self.toolchangez_entry = FCDoubleSpinner()
|
||||
self.toolchangez_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.toolchangez_entry.set_range(0.0001, 9999.9999)
|
||||
else:
|
||||
self.toolchangez_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid0.addWidget(toolchangezlabel, 7, 0)
|
||||
grid0.addWidget(self.toolchangez_entry, 7, 1, 1, 2)
|
||||
|
||||
# End Move Z
|
||||
endz_label = QtWidgets.QLabel('%s:' % _('End move Z'))
|
||||
endz_label.setToolTip(
|
||||
_("Height of the tool after\n"
|
||||
"the last move at the end of the job.")
|
||||
)
|
||||
self.endz_entry = FCDoubleSpinner()
|
||||
self.endz_entry.set_precision(self.decimals)
|
||||
|
||||
if machinist_setting == 0:
|
||||
self.endz_entry.set_range(0.0000, 9999.9999)
|
||||
else:
|
||||
self.endz_entry.set_range(-9999.9999, 9999.9999)
|
||||
|
||||
grid0.addWidget(endz_label, 8, 0)
|
||||
grid0.addWidget(self.endz_entry, 8, 1, 1, 2)
|
||||
|
||||
# End Move X,Y
|
||||
endmove_xy_label = QtWidgets.QLabel('%s:' % _('End move X,Y'))
|
||||
endmove_xy_label.setToolTip(
|
||||
_("End move X,Y position. In format (x,y).\n"
|
||||
"If no value is entered then there is no move\n"
|
||||
"on X,Y plane at the end of the job.")
|
||||
)
|
||||
self.endxy_entry = NumericalEvalTupleEntry(border_color='#0069A9')
|
||||
|
||||
grid0.addWidget(endmove_xy_label, 9, 0)
|
||||
grid0.addWidget(self.endxy_entry, 9, 1, 1, 2)
|
||||
|
||||
# Feedrate Z
|
||||
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate Z'))
|
||||
frlabel.setToolTip(
|
||||
_("Tool speed while drilling\n"
|
||||
"(in units per minute).\n"
|
||||
"So called 'Plunge' feedrate.\n"
|
||||
"This is for linear move G01.")
|
||||
)
|
||||
self.feedrate_z_entry = FCDoubleSpinner()
|
||||
self.feedrate_z_entry.set_precision(self.decimals)
|
||||
self.feedrate_z_entry.set_range(0, 99999.9999)
|
||||
|
||||
grid0.addWidget(frlabel, 10, 0)
|
||||
grid0.addWidget(self.feedrate_z_entry, 10, 1, 1, 2)
|
||||
|
||||
# Spindle speed
|
||||
spdlabel = QtWidgets.QLabel('%s:' % _('Spindle Speed'))
|
||||
spdlabel.setToolTip(
|
||||
_("Speed of the spindle\n"
|
||||
"in RPM (optional)")
|
||||
)
|
||||
|
||||
self.spindlespeed_entry = FCSpinner()
|
||||
self.spindlespeed_entry.set_range(0, 1000000)
|
||||
self.spindlespeed_entry.set_step(100)
|
||||
|
||||
grid0.addWidget(spdlabel, 11, 0)
|
||||
grid0.addWidget(self.spindlespeed_entry, 11, 1, 1, 2)
|
||||
|
||||
# Dwell
|
||||
self.dwell_cb = FCCheckBox('%s' % _('Enable Dwell'))
|
||||
self.dwell_cb.setToolTip(
|
||||
_("Pause to allow the spindle to reach its\n"
|
||||
"speed before cutting.")
|
||||
)
|
||||
|
||||
grid0.addWidget(self.dwell_cb, 12, 0, 1, 3)
|
||||
|
||||
# Dwell Time
|
||||
dwelltime = QtWidgets.QLabel('%s:' % _('Duration'))
|
||||
dwelltime.setToolTip(_("Number of time units for spindle to dwell."))
|
||||
self.dwelltime_entry = FCDoubleSpinner()
|
||||
self.dwelltime_entry.set_precision(self.decimals)
|
||||
self.dwelltime_entry.set_range(0, 99999.9999)
|
||||
|
||||
grid0.addWidget(dwelltime, 13, 0)
|
||||
grid0.addWidget(self.dwelltime_entry, 13, 1, 1, 2)
|
||||
|
||||
self.ois_dwell_exc = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry])
|
||||
|
||||
# preprocessor selection
|
||||
pp_excellon_label = QtWidgets.QLabel('%s:' % _("Preprocessor"))
|
||||
pp_excellon_label.setToolTip(
|
||||
_("The preprocessor JSON file that dictates\n"
|
||||
"Gcode output.")
|
||||
)
|
||||
|
||||
self.pp_excellon_name_cb = FCComboBox()
|
||||
self.pp_excellon_name_cb.setFocusPolicy(Qt.StrongFocus)
|
||||
|
||||
grid0.addWidget(pp_excellon_label, 14, 0)
|
||||
grid0.addWidget(self.pp_excellon_name_cb, 14, 1, 1, 2)
|
||||
|
||||
separator_line = QtWidgets.QFrame()
|
||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||
grid0.addWidget(separator_line, 16, 0, 1, 3)
|
||||
|
||||
# DRILL SLOTS LABEL
|
||||
self.dslots_label = QtWidgets.QLabel('<b>%s:</b>' % _('Drilling Slots'))
|
||||
grid0.addWidget(self.dslots_label, 18, 0, 1, 3)
|
||||
|
||||
# Drill slots
|
||||
self.drill_slots_cb = FCCheckBox('%s' % _('Drill slots'))
|
||||
self.drill_slots_cb.setToolTip(
|
||||
_("If the selected tool has slots then they will be drilled.")
|
||||
)
|
||||
grid0.addWidget(self.drill_slots_cb, 20, 0, 1, 3)
|
||||
|
||||
# Drill Overlap
|
||||
self.drill_overlap_label = QtWidgets.QLabel('%s:' % _('Overlap'))
|
||||
self.drill_overlap_label.setToolTip(
|
||||
_("How much (percentage) of the tool diameter to overlap previous drill hole.")
|
||||
)
|
||||
|
||||
self.drill_overlap_entry = FCDoubleSpinner()
|
||||
self.drill_overlap_entry.set_precision(self.decimals)
|
||||
self.drill_overlap_entry.set_range(0.0, 9999.9999)
|
||||
self.drill_overlap_entry.setSingleStep(0.1)
|
||||
|
||||
grid0.addWidget(self.drill_overlap_label, 22, 0)
|
||||
grid0.addWidget(self.drill_overlap_entry, 22, 1, 1, 2)
|
||||
|
||||
# Last drill in slot
|
||||
self.last_drill_cb = FCCheckBox('%s' % _('Last drill'))
|
||||
self.last_drill_cb.setToolTip(
|
||||
_("If the slot length is not completely covered by drill holes,\n"
|
||||
"add a drill hole on the slot end point.")
|
||||
)
|
||||
grid0.addWidget(self.last_drill_cb, 24, 0, 1, 3)
|
||||
|
||||
self.layout.addStretch()
|
||||
@@ -14,6 +14,7 @@ from appGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroup
|
||||
from appGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI
|
||||
from appGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI
|
||||
from appGUI.preferences.tools.ToolsISOPrefGroupUI import ToolsISOPrefGroupUI
|
||||
from appGUI.preferences.tools.ToolsDrillPrefGroupUI import ToolsDrillPrefGroupUI
|
||||
|
||||
import gettext
|
||||
import appTranslation as fcTranslate
|
||||
@@ -41,6 +42,9 @@ class ToolsPreferencesUI(QtWidgets.QWidget):
|
||||
self.tools_iso_group = ToolsISOPrefGroupUI(decimals=self.decimals)
|
||||
self.tools_iso_group.setMinimumWidth(220)
|
||||
|
||||
self.tools_drill_group = ToolsDrillPrefGroupUI(decimals=self.decimals)
|
||||
self.tools_drill_group.setMinimumWidth(220)
|
||||
|
||||
self.tools_ncc_group = ToolsNCCPrefGroupUI(decimals=self.decimals)
|
||||
self.tools_ncc_group.setMinimumWidth(220)
|
||||
|
||||
@@ -75,17 +79,19 @@ class ToolsPreferencesUI(QtWidgets.QWidget):
|
||||
self.tools_sub_group.setMinimumWidth(200)
|
||||
|
||||
self.vlay = QtWidgets.QVBoxLayout()
|
||||
self.vlay.addWidget(self.tools_ncc_group)
|
||||
self.vlay.addWidget(self.tools_cutout_group)
|
||||
|
||||
self.vlay.addWidget(self.tools_iso_group)
|
||||
self.vlay.addWidget(self.tools_drill_group)
|
||||
|
||||
self.vlay1 = QtWidgets.QVBoxLayout()
|
||||
self.vlay1.addWidget(self.tools_paint_group)
|
||||
self.vlay1.addWidget(self.tools_iso_group)
|
||||
self.vlay1.addWidget(self.tools_ncc_group)
|
||||
self.vlay1.addWidget(self.tools_2sided_group)
|
||||
self.vlay1.addWidget(self.tools_cutout_group)
|
||||
self.vlay1.addWidget(self.tools_sub_group)
|
||||
|
||||
self.vlay2 = QtWidgets.QVBoxLayout()
|
||||
self.vlay2.addWidget(self.tools_paint_group)
|
||||
self.vlay2.addWidget(self.tools_transform_group)
|
||||
self.vlay2.addWidget(self.tools_2sided_group)
|
||||
self.vlay2.addWidget(self.tools_sub_group)
|
||||
|
||||
self.vlay3 = QtWidgets.QVBoxLayout()
|
||||
self.vlay3.addWidget(self.tools_film_group)
|
||||
|
||||
Reference in New Issue
Block a user