From ca8db9cacd09f2932a7d53acf1e8099dcc94f5ea Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 5 Jan 2021 06:20:13 +0200 Subject: [PATCH] - changing some parameters from 'geometry_' to 'tools_mill_' format --- CHANGELOG.md | 6 +++++- appDatabase.py | 4 ++-- appObjects/FlatCAMGerber.py | 8 ++++---- appParsers/ParseHPGL2.py | 4 ++-- appTools/ToolCutOut.py | 8 ++++---- appTools/ToolIsolation.py | 27 +++++++++++---------------- appTools/ToolMilling.py | 3 +++ appTools/ToolNCC.py | 6 +++--- tclCommands/TclCommandCopperClear.py | 4 ++-- 9 files changed, 36 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b52b027..328d758f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,11 @@ CHANGELOG for FlatCAM beta ================================================= -4.01.2020 +5.01.2021 + +- changing some parameters from 'geometry_' to 'tools_mill_' format + +4.01.2021 - Levelling Tool - disable the UI if the Gcode is not segmented for autolevelling (perhaps recreate the GCode as segmented?) - in camlib.CNCjob class fixed the linear2gcode_extra() method to be able to do GCode segmentation. diff --git a/appDatabase.py b/appDatabase.py index fc5c20e1..fafba1df 100644 --- a/appDatabase.py +++ b/appDatabase.py @@ -1923,8 +1923,8 @@ class ToolsDB2(QtWidgets.QWidget): "cutz": float(self.app.defaults["geometry_cutz"]), "multidepth": self.app.defaults["geometry_multidepth"], "depthperpass": float(self.app.defaults["geometry_depthperpass"]), - "vtipdia": float(self.app.defaults["geometry_vtipdia"]), - "vtipangle": float(self.app.defaults["geometry_vtipangle"]), + "vtipdia": float(self.app.defaults["tools_mill_vtipdia"]), + "vtipangle": float(self.app.defaults["tools_mill_vtipangle"]), "travelz": float(self.app.defaults["geometry_travelz"]), "feedrate": float(self.app.defaults["geometry_feedrate"]), "feedrate_z": float(self.app.defaults["geometry_feedrate_z"]), diff --git a/appObjects/FlatCAMGerber.py b/appObjects/FlatCAMGerber.py index 06cc6370..8954d3db 100644 --- a/appObjects/FlatCAMGerber.py +++ b/appObjects/FlatCAMGerber.py @@ -510,8 +510,8 @@ class GerberObject(FlatCAMObj, Gerber): tool_type = 'V' else: new_cutz = self.app.defaults['geometry_cutz'] - new_vtipdia = self.app.defaults['geometry_vtipdia'] - new_vtipangle = self.app.defaults['geometry_vtipangle'] + new_vtipdia = self.app.defaults['tools_mill_vtipdia'] + new_vtipangle = self.app.defaults['tools_mill_vtipangle'] tool_type = 'C1' # store here the default data for Geometry Data @@ -655,8 +655,8 @@ class GerberObject(FlatCAMObj, Gerber): tool_type = 'V' else: new_cutz = self.app.defaults['geometry_cutz'] - new_vtipdia = self.app.defaults['geometry_vtipdia'] - new_vtipangle = self.app.defaults['geometry_vtipangle'] + new_vtipdia = self.app.defaults['tools_mill_vtipdia'] + new_vtipangle = self.app.defaults['tools_mill_vtipangle'] tool_type = 'C1' # store here the default data for Geometry Data diff --git a/appParsers/ParseHPGL2.py b/appParsers/ParseHPGL2.py index 80750e69..6692e067 100644 --- a/appParsers/ParseHPGL2.py +++ b/appParsers/ParseHPGL2.py @@ -55,8 +55,8 @@ class HPGL2: "name": '_ncc', "plot": self.app.defaults["geometry_plot"], "cutz": self.app.defaults["geometry_cutz"], - "vtipdia": self.app.defaults["geometry_vtipdia"], - "vtipangle": self.app.defaults["geometry_vtipangle"], + "vtipdia": self.app.defaults["tools_mill_vtipdia"], + "vtipangle": self.app.defaults["tools_mill_vtipangle"], "travelz": self.app.defaults["geometry_travelz"], "feedrate": self.app.defaults["geometry_feedrate"], "feedrate_z": self.app.defaults["geometry_feedrate_z"], diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py index defb2f0b..0d6212b5 100644 --- a/appTools/ToolCutOut.py +++ b/appTools/ToolCutOut.py @@ -238,8 +238,8 @@ class CutOut(AppTool): "multidepth": self.app.defaults["geometry_multidepth"], "depthperpass": float(self.app.defaults["geometry_depthperpass"]), - "vtipdia": float(self.app.defaults["geometry_vtipdia"]), - "vtipangle": float(self.app.defaults["geometry_vtipangle"]), + "vtipdia": float(self.app.defaults["tools_mill_vtipdia"]), + "vtipangle": float(self.app.defaults["tools_mill_vtipangle"]), "travelz": float(self.app.defaults["geometry_travelz"]), "feedrate": float(self.app.defaults["geometry_feedrate"]), "feedrate_z": float(self.app.defaults["geometry_feedrate_z"]), @@ -575,8 +575,8 @@ class CutOut(AppTool): "multidepth": self.app.defaults["geometry_multidepth"], "depthperpass": float(self.app.defaults["geometry_depthperpass"]), - "vtipdia": float(self.app.defaults["geometry_vtipdia"]), - "vtipangle": float(self.app.defaults["geometry_vtipangle"]), + "vtipdia": float(self.app.defaults["tools_mill_vtipdia"]), + "vtipangle": float(self.app.defaults["tools_mill_vtipangle"]), "travelz": float(self.app.defaults["geometry_travelz"]), "feedrate": float(self.app.defaults["geometry_feedrate"]), "feedrate_z": float(self.app.defaults["geometry_feedrate_z"]), diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py index 83beba3c..5e6acc00 100644 --- a/appTools/ToolIsolation.py +++ b/appTools/ToolIsolation.py @@ -305,7 +305,16 @@ class ToolIsolation(AppTool, Gerber): # init the working variables self.default_data.clear() - self.default_data = { + kind = 'geometry' + for option in self.app.options: + if option.find(kind + "_") == 0: + oname = option[len(kind) + 1:] + self.default_data[oname] = self.app.options[option] + + if option.find('tools_mill_') == 0 or option.find('tools_iso_') == 0: + self.default_data[option] = self.app.options[option] + + self.default_data.update({ "name": outname + '_iso', "plot": self.app.defaults["geometry_plot"], "cutz": float(self.app.defaults["tools_iso_tool_cutz"]), @@ -340,21 +349,7 @@ class ToolIsolation(AppTool, Gerber): "area_shape": self.app.defaults["geometry_area_shape"], "area_strategy": self.app.defaults["geometry_area_strategy"], "area_overz": float(self.app.defaults["geometry_area_overz"]), - - "tools_iso_order": self.app.defaults["tools_iso_order"], - "tools_iso_passes": self.app.defaults["tools_iso_passes"], - "tools_iso_overlap": self.app.defaults["tools_iso_overlap"], - "tools_iso_milling_type": self.app.defaults["tools_iso_milling_type"], - "tools_iso_isotype": self.app.defaults["tools_iso_isotype"], - - "tools_iso_rest": self.app.defaults["tools_iso_rest"], - "tools_iso_combine_passes": self.app.defaults["tools_iso_combine_passes"], - "tools_iso_isoexcept": self.app.defaults["tools_iso_isoexcept"], - "tools_iso_selection": self.app.defaults["tools_iso_selection"], - "tools_iso_poly_ints": self.app.defaults["tools_iso_poly_ints"], - "tools_iso_force": self.app.defaults["tools_iso_force"], - "tools_iso_area_shape": self.app.defaults["tools_iso_area_shape"] - } + }) try: dias = [float(self.app.defaults["tools_iso_tooldia"])] diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py index 391c17b3..1a567b69 100644 --- a/appTools/ToolMilling.py +++ b/appTools/ToolMilling.py @@ -1124,6 +1124,9 @@ class ToolMilling(AppTool, Excellon): self.build_ui() def on_object_changed(self): + if not self.app.ui.notebook.tabText(2) != _("Milling Tool"): + return + # handle the Plot checkbox self.plot_cb_handler() diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py index fa1037a8..a1662b4b 100644 --- a/appTools/ToolNCC.py +++ b/appTools/ToolNCC.py @@ -555,8 +555,8 @@ class NonCopperClear(AppTool, Gerber): "name": '_ncc', "plot": self.app.defaults["geometry_plot"], "cutz": float(self.app.defaults["geometry_cutz"]), - "vtipdia": float(self.app.defaults["geometry_vtipdia"]), - "vtipangle": float(self.app.defaults["geometry_vtipangle"]), + "vtipdia": float(self.app.defaults["tools_mill_vtipdia"]), + "vtipangle": float(self.app.defaults["tools_mill_vtipangle"]), "travelz": self.app.defaults["geometry_travelz"], "feedrate": self.app.defaults["geometry_feedrate"], "feedrate_z": self.app.defaults["geometry_feedrate_z"], @@ -4662,7 +4662,7 @@ class NccUI: } """) self.tools_box.addWidget(self.generate_ncc_button) - self.tools_box.addStretch() + self.tools_box.addStretch(1) # ## Reset Tool self.reset_button = FCButton(_("Reset Tool")) diff --git a/tclCommands/TclCommandCopperClear.py b/tclCommands/TclCommandCopperClear.py index aa3f08bc..7afcff23 100644 --- a/tclCommands/TclCommandCopperClear.py +++ b/tclCommands/TclCommandCopperClear.py @@ -194,8 +194,8 @@ class TclCommandCopperClear(TclCommand): "name": outname, "plot": False, "cutz": self.app.defaults["geometry_cutz"], - "vtipdia": float(self.app.defaults["geometry_vtipdia"]), - "vtipangle": float(self.app.defaults["geometry_vtipangle"]), + "vtipdia": float(self.app.defaults["tools_mill_vtipdia"]), + "vtipangle": float(self.app.defaults["tools_mill_vtipangle"]), "travelz": self.app.defaults["geometry_travelz"], "feedrate": self.app.defaults["geometry_feedrate"], "feedrate_z": self.app.defaults["geometry_feedrate_z"],