From 7a2fdc2f05f9e2cce794ee54c7e0b16da3a6a62c Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 19 Aug 2021 01:37:34 +0300 Subject: [PATCH] - some cleaning up in the Preferences --- CHANGELOG.md | 4 ++++ appGUI/preferences/PreferencesUIManager.py | 3 --- appGUI/preferences/tools/ToolsISOPrefGroupUI.py | 11 ----------- appGUI/preferences/tools/ToolsNCCPrefGroupUI.py | 11 ----------- appGUI/preferences/tools/ToolsPaintPrefGroupUI.py | 8 -------- appPlugins/ToolIsolation.py | 1 + appPlugins/ToolMilling.py | 1 - appPlugins/ToolPaint.py | 4 ---- defaults.py | 6 ------ 9 files changed, 5 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e7ce3ae..176284c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta ================================================= +19.08.2021 + +- some cleaning up in the Preferences + 18.08.2021 - fixed the "Set Color" functionality broken by recent changes diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py index 70e29848..a8e65b44 100644 --- a/appGUI/preferences/PreferencesUIManager.py +++ b/appGUI/preferences/PreferencesUIManager.py @@ -281,7 +281,6 @@ class PreferencesUIManager: # Isolation Routing Tool "tools_iso_tooldia": self.ui.plugin_eng_pref_form.tools_iso_group.tool_dia_entry, "tools_iso_order": self.ui.plugin_eng_pref_form.tools_iso_group.order_radio, - "tools_iso_tool_type": self.ui.plugin_eng_pref_form.tools_iso_group.tool_type_radio, "tools_iso_tool_vtipdia": self.ui.plugin_eng_pref_form.tools_iso_group.tipdia_entry, "tools_iso_tool_vtipangle": self.ui.plugin_eng_pref_form.tools_iso_group.tipangle_entry, "tools_iso_tool_cutz": self.ui.plugin_eng_pref_form.tools_iso_group.cutz_entry, @@ -422,7 +421,6 @@ class PreferencesUIManager: "tools_ncc_ref": self.ui.plugin_eng_pref_form.tools_ncc_group.select_combo, "tools_ncc_area_shape": self.ui.plugin_eng_pref_form.tools_ncc_group.area_shape_radio, "tools_ncc_milling_type": self.ui.plugin_eng_pref_form.tools_ncc_group.milling_type_radio, - "tools_ncc_tool_type": self.ui.plugin_eng_pref_form.tools_ncc_group.tool_type_radio, "tools_ncc_cutz": self.ui.plugin_eng_pref_form.tools_ncc_group.cutz_entry, "tools_ncc_tipdia": self.ui.plugin_eng_pref_form.tools_ncc_group.tipdia_entry, "tools_ncc_tipangle": self.ui.plugin_eng_pref_form.tools_ncc_group.tipangle_entry, @@ -464,7 +462,6 @@ class PreferencesUIManager: "tools_paint_plotting": self.ui.plugin_eng_pref_form.tools_paint_group.paint_plotting_radio, "tools_paint_rest": self.ui.plugin_eng_pref_form.tools_paint_group.rest_cb, - "tools_paint_tool_type": self.ui.plugin_eng_pref_form.tools_paint_group.tool_type_radio, "tools_paint_cutz": self.ui.plugin_eng_pref_form.tools_paint_group.cutz_entry, "tools_paint_tipdia": self.ui.plugin_eng_pref_form.tools_paint_group.tipdia_entry, "tools_paint_tipangle": self.ui.plugin_eng_pref_form.tools_paint_group.tipangle_entry, diff --git a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py index 3fa53b60..f80e89d3 100644 --- a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py +++ b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py @@ -68,17 +68,6 @@ class ToolsISOPrefGroupUI(OptionsGroupUI): "- Circular") ) - self.tool_type_radio = RadioSet([{'label': _('V-shape'), 'value': 'V'}, - {'label': _('Circular'), 'value': 'C1'}]) - self.tool_type_radio.setToolTip( - _("Default tool type:\n" - "- 'V-shape'\n" - "- Circular") - ) - - grid0.addWidget(self.tool_type_label, 4, 0) - grid0.addWidget(self.tool_type_radio, 4, 1, 1, 2) - # Tip Dia self.tipdialabel = FCLabel('%s:' % _('V-Tip Dia')) self.tipdialabel.setToolTip( diff --git a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py index fd51ffa0..b2a432c0 100644 --- a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py +++ b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py @@ -51,17 +51,6 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI): "- Circular") ) - self.tool_type_radio = RadioSet([{'label': _('V-shape'), 'value': 'V'}, - {'label': _('Circular'), 'value': 'C1'}]) - self.tool_type_radio.setToolTip( - _("Default tool type:\n" - "- 'V-shape'\n" - "- Circular") - ) - - grid0.addWidget(self.tool_type_label, 1, 0) - grid0.addWidget(self.tool_type_radio, 1, 1) - # Tip Dia self.tipdialabel = FCLabel('%s:' % _('V-Tip Dia')) self.tipdialabel.setToolTip( diff --git a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py index a64500b2..179e799c 100644 --- a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py +++ b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py @@ -58,14 +58,6 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI): "- Circular") ) - self.tool_type_radio = RadioSet([{'label': _('V-shape'), 'value': 'V'}, - {'label': _('Circular'), 'value': 'C1'}]) - - self.tool_type_radio.setObjectName(_("Tool Type")) - - grid0.addWidget(self.tool_type_label, 1, 0) - grid0.addWidget(self.tool_type_radio, 1, 1) - # Tip Dia self.tipdialabel = FCLabel('%s:' % _('V-Tip Dia')) self.tipdialabel.setToolTip( diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py index 1190a169..c3ac62a9 100644 --- a/appPlugins/ToolIsolation.py +++ b/appPlugins/ToolIsolation.py @@ -276,6 +276,7 @@ class ToolIsolation(AppTool, Gerber): self.init_context_menu() self.form_fields = { + "tools_mill_tool_shape": self.ui.tool_shape_combo, "tools_iso_passes": self.ui.passes_entry, "tools_iso_overlap": self.ui.iso_overlap_entry, "tools_iso_milling_type": self.ui.milling_type_radio, diff --git a/appPlugins/ToolMilling.py b/appPlugins/ToolMilling.py index 92b67379..98cc5964 100644 --- a/appPlugins/ToolMilling.py +++ b/appPlugins/ToolMilling.py @@ -596,7 +596,6 @@ class ToolMilling(AppTool, Excellon): # "tools_mill_polish_overlap": 10, # "tools_mill_polish_method": _("Standard"), # - # "tools_mill_tool_type": 'C1', # "tools_mill_vtipdia": 0.1, # "tools_mill_vtipangle": 30, # diff --git a/appPlugins/ToolPaint.py b/appPlugins/ToolPaint.py index 8812f069..df1968bb 100644 --- a/appPlugins/ToolPaint.py +++ b/appPlugins/ToolPaint.py @@ -1013,10 +1013,6 @@ class ToolPaint(AppTool, Gerber): self.paint_tools.update({ int(self.tooluid): { 'tooldia': truncated_tooldia, - 'offset': 'Path', - 'offset_value': 0.0, - 'type': 'Iso' if self.app.defaults["tools_paint_tool_type"] == 'V' else 'Rough', - 'tool_type': deepcopy(self.app.defaults["tools_paint_tool_type"]), 'data': deepcopy(self.default_data), 'solid_geometry': [] } diff --git a/defaults.py b/defaults.py index 86f19d57..3208d1a8 100644 --- a/defaults.py +++ b/defaults.py @@ -350,7 +350,6 @@ class FlatCAMDefaults: # Isolation Routing Plugin "tools_iso_tooldia": "0.1", "tools_iso_order": 'rev', - "tools_iso_tool_type": 'C1', "tools_iso_tool_vtipdia": 0.1, "tools_iso_tool_vtipangle": 30, "tools_iso_tool_cutz": -0.05, @@ -409,9 +408,6 @@ class FlatCAMDefaults: "tools_drill_area_strategy": "over", "tools_drill_area_overz": 1.0, - # Milling Plugin - "tools_mill_tool_type": 'C1', - # Milling Plugin Options "tools_mill_tooldia": "2.4", "tools_mill_offset_type": 0, # _('Path') @@ -493,7 +489,6 @@ class FlatCAMDefaults: "tools_ncc_ref": 0, # ITSELF "tools_ncc_area_shape": "square", "tools_ncc_milling_type": 'cl', - "tools_ncc_tool_type": 'C1', "tools_ncc_cutz": -0.05, "tools_ncc_tipdia": 0.1, "tools_ncc_tipangle": 30, @@ -532,7 +527,6 @@ class FlatCAMDefaults: "tools_paint_contour": True, "tools_paint_plotting": 'normal', "tools_paint_rest": False, - "tools_paint_tool_type": 'C1', "tools_paint_cutz": -0.05, "tools_paint_tipdia": 0.1, "tools_paint_tipangle": 30,