From 2e54dc6920e165a9924addde61f16e326634de0d Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sat, 9 May 2020 18:21:50 +0100 Subject: [PATCH] Geometry advanced options --- flatcamGUI/preferences/OptionUI.py | 11 +- .../preferences/PreferencesUIManager.py | 18 - .../geometry/GeometryAdvOptPrefGroupUI.py | 367 +++++++----------- .../geometry/GeometryOptPrefGroupUI.py | 2 +- 4 files changed, 144 insertions(+), 254 deletions(-) diff --git a/flatcamGUI/preferences/OptionUI.py b/flatcamGUI/preferences/OptionUI.py index 1fb34b72..90512c04 100644 --- a/flatcamGUI/preferences/OptionUI.py +++ b/flatcamGUI/preferences/OptionUI.py @@ -2,7 +2,7 @@ from typing import Union, Sequence, List from PyQt5 import QtWidgets from flatcamGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner, FCColorEntry, \ - FCSliderWithSpinner, FCDoubleSpinner + FCSliderWithSpinner, FCDoubleSpinner, FloatEntry import gettext import FlatCAMTranslation as fcTranslate @@ -64,12 +64,15 @@ class BasicOptionUI(OptionUI): class LineEntryOptionUI(BasicOptionUI): - def __init__(self, option: str, label_text: str, **kwargs): - super().__init__(option=option, label_text=label_text, **kwargs) - def build_entry_widget(self) -> QtWidgets.QWidget: return FCEntry() +# Not sure why this is needed over DoubleSpinnerOptionUI +class FloatEntryOptionUI(BasicOptionUI): + def build_entry_widget(self) -> QtWidgets.QWidget: + return FloatEntry() + + class RadioSetOptionUI(BasicOptionUI): diff --git a/flatcamGUI/preferences/PreferencesUIManager.py b/flatcamGUI/preferences/PreferencesUIManager.py index c46f374c..b21a0c71 100644 --- a/flatcamGUI/preferences/PreferencesUIManager.py +++ b/flatcamGUI/preferences/PreferencesUIManager.py @@ -142,24 +142,6 @@ class PreferencesUIManager: self.ui.excellon_defaults_form.excellon_editor_group.slot_array_circular_angle_entry, - - # Geometry Advanced Options - "geometry_toolchangexy": self.ui.geometry_defaults_form.geometry_adv_opt_group.toolchangexy_entry, - "geometry_startz": self.ui.geometry_defaults_form.geometry_adv_opt_group.gstartz_entry, - "geometry_feedrate_rapid": self.ui.geometry_defaults_form.geometry_adv_opt_group.feedrate_rapid_entry, - "geometry_extracut": self.ui.geometry_defaults_form.geometry_adv_opt_group.extracut_cb, - "geometry_extracut_length": self.ui.geometry_defaults_form.geometry_adv_opt_group.e_cut_entry, - "geometry_z_pdepth": self.ui.geometry_defaults_form.geometry_adv_opt_group.pdepth_entry, - "geometry_feedrate_probe": self.ui.geometry_defaults_form.geometry_adv_opt_group.feedrate_probe_entry, - "geometry_spindledir": self.ui.geometry_defaults_form.geometry_adv_opt_group.spindledir_radio, - "geometry_f_plunge": self.ui.geometry_defaults_form.geometry_adv_opt_group.fplunge_cb, - "geometry_segx": self.ui.geometry_defaults_form.geometry_adv_opt_group.segx_entry, - "geometry_segy": self.ui.geometry_defaults_form.geometry_adv_opt_group.segy_entry, - "geometry_area_exclusion": self.ui.geometry_defaults_form.geometry_adv_opt_group.exclusion_cb, - "geometry_area_shape": self.ui.geometry_defaults_form.geometry_adv_opt_group.area_shape_radio, - "geometry_area_strategy": self.ui.geometry_defaults_form.geometry_adv_opt_group.strategy_radio, - "geometry_area_overz": self.ui.geometry_defaults_form.geometry_adv_opt_group.over_z_entry, - # CNCJob General "cncjob_plot": self.ui.cncjob_defaults_form.cncjob_gen_group.plot_cb, "cncjob_plot_kind": self.ui.cncjob_defaults_form.cncjob_gen_group.cncplot_method_radio, diff --git a/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py index 1496fb96..57993400 100644 --- a/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py +++ b/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py @@ -1,245 +1,150 @@ -from PyQt5 import QtWidgets -from PyQt5.QtCore import QSettings - -from flatcamGUI.GUIElements import FCEntry, FloatEntry, FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from flatcamGUI.preferences.OptionUI import * +from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI2 import gettext import FlatCAMTranslation 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 GeometryAdvOptPrefGroupUI(OptionsGroupUI2): -class GeometryAdvOptPrefGroupUI(OptionsGroupUI): - def __init__(self, decimals=4, parent=None): - super(GeometryAdvOptPrefGroupUI, self).__init__(self, parent=parent) - - self.setTitle(str(_("Geometry Adv. Options"))) + def __init__(self, decimals=4, **kwargs): self.decimals = decimals + super().__init__(**kwargs) + self.setTitle(str(_("Geometry Adv. Options"))) - # ------------------------------ - # ## Advanced Options - # ------------------------------ - self.geo_label = QtWidgets.QLabel('%s:' % _('Advanced Options')) - self.geo_label.setToolTip( - _("A list of Geometry advanced parameters.\n" - "Those parameters are available only for\n" - "Advanced App. Level.") - ) - self.layout.addWidget(self.geo_label) + def build_options(self) -> [OptionUI]: + return [ + HeadingOptionUI( + label_text="Advanced Options", + label_tooltip="A list of Geometry advanced parameters.\n" + "Those parameters are available only for\n" + "Advanced App. Level." + ), + LineEntryOptionUI( + option="geometry_toolchangexy", + label_text="Toolchange X-Y", + label_tooltip="Toolchange X,Y position." + ), + FloatEntryOptionUI( + option="geometry_startz", + label_text="Start Z", + label_tooltip="Height of the tool just after starting the work.\n" + "Delete the value if you don't need this feature." + ), + DoubleSpinnerOptionUI( + option="geometry_feedrate_rapid", + label_text="Feedrate Rapids", + label_tooltip="Cutting speed in the XY plane\n" + "(in units per minute).\n" + "This is for the rapid move G00.\n" + "It is useful only for Marlin,\n" + "ignore for any other cases.", + min_value=0, max_value=99999.9999, step=10, decimals=self.decimals + ), + CheckboxOptionUI( + option="geometry_extracut", + label_text="Re-cut", + label_tooltip="In order to remove possible\n" + "copper leftovers where first cut\n" + "meet with last cut, we generate an\n" + "extended cut over the first cut section." + ), + DoubleSpinnerOptionUI( + option="geometry_extracut_length", + label_text="Re-cut length", + label_tooltip="In order to remove possible\n" + "copper leftovers where first cut\n" + "meet with last cut, we generate an\n" + "extended cut over the first cut section.", + min_value=0, max_value=99999, step=0.1, decimals=self.decimals + ), + DoubleSpinnerOptionUI( + option="geometry_z_pdepth", + label_text="Probe Z depth", + label_tooltip="The maximum depth that the probe is allowed\n" + "to probe. Negative value, in current units.", + min_value=-99999, max_value=0.0, step=0.1, decimals=self.decimals + ), + DoubleSpinnerOptionUI( + option="geometry_feedrate_probe", + label_text="Feedrate Probe", + label_tooltip="The feedrate used while the probe is probing.", + min_value=0, max_value=99999.9999, step=0.1, decimals=self.decimals + ), + RadioSetOptionUI( + option="geometry_spindledir", + label_text="Spindle direction", + label_tooltip="This sets the direction that the spindle is rotating.\n" + "It can be either:\n" + "- CW = clockwise or\n" + "- CCW = counter clockwise", + choices=[{'label': _('CW'), 'value': 'CW'}, + {'label': _('CCW'), 'value': 'CCW'}] + ), + CheckboxOptionUI( + option="geometry_f_plunge", + label_text="Fast Plunge", + label_tooltip="By checking this, the vertical move from\n" + "Z_Toolchange to Z_move is done with G0,\n" + "meaning the fastest speed available.\n" + "WARNING: the move is done at Toolchange X,Y coords." + ), + DoubleSpinnerOptionUI( + option="geometry_segx", + label_text="Segment X size", + label_tooltip="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.", + min_value=0, max_value=99999, step=0.1, decimals=self.decimals + ), + DoubleSpinnerOptionUI( + option="geometry_segy", + label_text="Segment Y size", + label_tooltip="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.", + min_value=0, max_value=99999, step=0.1, decimals=self.decimals + ), - grid1 = QtWidgets.QGridLayout() - self.layout.addLayout(grid1) - - # Toolchange X,Y - toolchange_xy_label = QtWidgets.QLabel('%s:' % _('Toolchange X-Y')) - toolchange_xy_label.setToolTip( - _("Toolchange X,Y position.") - ) - grid1.addWidget(toolchange_xy_label, 1, 0) - self.toolchangexy_entry = FCEntry() - grid1.addWidget(self.toolchangexy_entry, 1, 1) - - # Start move Z - startzlabel = QtWidgets.QLabel('%s:' % _('Start Z')) - startzlabel.setToolTip( - _("Height of the tool just after starting the work.\n" - "Delete the value if you don't need this feature.") - ) - grid1.addWidget(startzlabel, 2, 0) - self.gstartz_entry = FloatEntry() - grid1.addWidget(self.gstartz_entry, 2, 1) - - # Feedrate rapids - fr_rapid_label = QtWidgets.QLabel('%s:' % _('Feedrate Rapids')) - fr_rapid_label.setToolTip( - _("Cutting speed in the XY plane\n" - "(in units per minute).\n" - "This is for the rapid move G00.\n" - "It is useful only for Marlin,\n" - "ignore for any other cases.") - ) - self.feedrate_rapid_entry = FCDoubleSpinner() - self.feedrate_rapid_entry.set_range(0, 99999.9999) - self.feedrate_rapid_entry.set_precision(self.decimals) - self.feedrate_rapid_entry.setSingleStep(0.1) - self.feedrate_rapid_entry.setWrapping(True) - - grid1.addWidget(fr_rapid_label, 4, 0) - grid1.addWidget(self.feedrate_rapid_entry, 4, 1) - - # End move extra cut - self.extracut_cb = FCCheckBox('%s' % _('Re-cut')) - self.extracut_cb.setToolTip( - _("In order to remove possible\n" - "copper leftovers where first cut\n" - "meet with last cut, we generate an\n" - "extended cut over the first cut section.") - ) - - self.e_cut_entry = FCDoubleSpinner() - self.e_cut_entry.set_range(0, 99999) - self.e_cut_entry.set_precision(self.decimals) - self.e_cut_entry.setSingleStep(0.1) - self.e_cut_entry.setWrapping(True) - self.e_cut_entry.setToolTip( - _("In order to remove possible\n" - "copper leftovers where first cut\n" - "meet with last cut, we generate an\n" - "extended cut over the first cut section.") - ) - grid1.addWidget(self.extracut_cb, 5, 0) - grid1.addWidget(self.e_cut_entry, 5, 1) - - # Probe depth - self.pdepth_label = QtWidgets.QLabel('%s:' % _("Probe Z depth")) - self.pdepth_label.setToolTip( - _("The maximum depth that the probe is allowed\n" - "to probe. Negative value, in current units.") - ) - self.pdepth_entry = FCDoubleSpinner() - self.pdepth_entry.set_range(-99999, 0.0000) - self.pdepth_entry.set_precision(self.decimals) - self.pdepth_entry.setSingleStep(0.1) - self.pdepth_entry.setWrapping(True) - - grid1.addWidget(self.pdepth_label, 6, 0) - grid1.addWidget(self.pdepth_entry, 6, 1) - - # Probe feedrate - self.feedrate_probe_label = QtWidgets.QLabel('%s:' % _("Feedrate Probe")) - self.feedrate_probe_label.setToolTip( - _("The feedrate used while the probe is probing.") - ) - self.feedrate_probe_entry = FCDoubleSpinner() - self.feedrate_probe_entry.set_range(0, 99999.9999) - self.feedrate_probe_entry.set_precision(self.decimals) - self.feedrate_probe_entry.setSingleStep(0.1) - self.feedrate_probe_entry.setWrapping(True) - - grid1.addWidget(self.feedrate_probe_label, 7, 0) - grid1.addWidget(self.feedrate_probe_entry, 7, 1) - - # Spindle direction - spindle_dir_label = QtWidgets.QLabel('%s:' % _('Spindle direction')) - spindle_dir_label.setToolTip( - _("This sets the direction that the spindle is rotating.\n" - "It can be either:\n" - "- CW = clockwise or\n" - "- CCW = counter clockwise") - ) - - self.spindledir_radio = RadioSet([{'label': _('CW'), 'value': 'CW'}, - {'label': _('CCW'), 'value': 'CCW'}]) - grid1.addWidget(spindle_dir_label, 8, 0) - grid1.addWidget(self.spindledir_radio, 8, 1) - - # Fast Move from Z Toolchange - self.fplunge_cb = FCCheckBox('%s' % _('Fast Plunge')) - self.fplunge_cb.setToolTip( - _("By checking this, the vertical move from\n" - "Z_Toolchange to Z_move is done with G0,\n" - "meaning the fastest speed available.\n" - "WARNING: the move is done at Toolchange X,Y coords.") - ) - grid1.addWidget(self.fplunge_cb, 9, 0, 1, 2) - - # Size of trace segment on X axis - segx_label = QtWidgets.QLabel('%s:' % _("Segment X size")) - segx_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) - - grid1.addWidget(segx_label, 10, 0) - grid1.addWidget(self.segx_entry, 10, 1) - - # Size of trace segment on Y axis - segy_label = QtWidgets.QLabel('%s:' % _("Segment Y size")) - segy_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) - - grid1.addWidget(segy_label, 11, 0) - grid1.addWidget(self.segy_entry, 11, 1) - - # ----------------------------- - # --- Area Exclusion ---------- - # ----------------------------- - self.adv_label = QtWidgets.QLabel('%s:' % _('Area Exclusion')) - self.adv_label.setToolTip( - _("Area exclusion parameters.\n" - "Those parameters are available only for\n" - "Advanced App. Level.") - ) - grid1.addWidget(self.adv_label, 12, 0, 1, 2) - - # Exclusion Area CB - self.exclusion_cb = FCCheckBox('%s:' % _("Exclusion areas")) - self.exclusion_cb.setToolTip( - _( - "Include exclusion areas.\n" - "In those areas the travel of the tools\n" - "is forbidden." + HeadingOptionUI( + label_text="Area Exclusion", + label_tooltip="Area exclusion parameters.\n" + "Those parameters are available only for\n" + "Advanced App. Level." + ), + CheckboxOptionUI( + option="geometry_area_exclusion", + label_text="Exclusion areas", + label_tooltip="Include exclusion areas.\n" + "In those areas the travel of the tools\n" + "is forbidden." + ), + RadioSetOptionUI( + option="geometry_area_shape", + label_text="Shape", + label_tooltip="The kind of selection shape used for area selection.", + choices=[{'label': _("Square"), 'value': 'square'}, + {'label': _("Polygon"), 'value': 'polygon'}] + ), + RadioSetOptionUI( + option="geometry_area_strategy", + label_text="Strategy", + label_tooltip="The strategy followed when encountering an exclusion area.\n" + "Can be:\n" + "- Over -> when encountering the area, the tool will go to a set height\n" + "- Around -> will avoid the exclusion area by going around the area", + choices=[{'label': _('Over'), 'value': 'over'}, + {'label': _('Around'), 'value': 'around'}] + ), + DoubleSpinnerOptionUI( + option="geometry_area_overz", + label_text="Over Z", + label_tooltip="The height Z to which the tool will rise in order to avoid\n" + "an interdiction area.", + min_value=0.0, max_value=9999.9999, step=0.5, decimals=self.decimals ) - ) - grid1.addWidget(self.exclusion_cb, 13, 0, 1, 2) - - # Area Selection shape - self.area_shape_label = QtWidgets.QLabel('%s:' % _("Shape")) - self.area_shape_label.setToolTip( - _("The kind of selection shape used for area selection.") - ) - - self.area_shape_radio = RadioSet([{'label': _("Square"), 'value': 'square'}, - {'label': _("Polygon"), 'value': 'polygon'}]) - - grid1.addWidget(self.area_shape_label, 14, 0) - grid1.addWidget(self.area_shape_radio, 14, 1) - - # Chose Strategy - self.strategy_label = FCLabel('%s:' % _("Strategy")) - self.strategy_label.setToolTip(_("The strategy followed when encountering an exclusion area.\n" - "Can be:\n" - "- Over -> when encountering the area, the tool will go to a set height\n" - "- Around -> will avoid the exclusion area by going around the area")) - self.strategy_radio = RadioSet([{'label': _('Over'), 'value': 'over'}, - {'label': _('Around'), 'value': 'around'}]) - - grid1.addWidget(self.strategy_label, 15, 0) - grid1.addWidget(self.strategy_radio, 15, 1) - - # Over Z - self.over_z_label = FCLabel('%s:' % _("Over Z")) - self.over_z_label.setToolTip(_("The height Z to which the tool will rise in order to avoid\n" - "an interdiction area.")) - self.over_z_entry = FCDoubleSpinner() - self.over_z_entry.set_range(0.000, 9999.9999) - self.over_z_entry.set_precision(self.decimals) - - grid1.addWidget(self.over_z_label, 18, 0) - grid1.addWidget(self.over_z_entry, 18, 1) - - self.layout.addStretch() + ] diff --git a/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py index 5a60d21c..102a9273 100644 --- a/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py +++ b/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py @@ -1,4 +1,4 @@ -from PyQt5.QtCore import Qt, QSettings +from PyQt5.QtCore import QSettings from flatcamGUI.GUIElements import OptionalInputSection from flatcamGUI.preferences import machinist_setting