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

- changing some parameters from 'geometry_' to 'tools_mill_' format

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-05 06:20:13 +02:00
committed by Marius
parent 92ba4b9a81
commit ca8db9cacd
9 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appTools/ToolCutOut.py
View File

@@ -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"]),

27
appTools/ToolIsolation.py
View File

@@ -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"])]

3
appTools/ToolMilling.py
View File

@@ -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()

6
appTools/ToolNCC.py
View File

@@ -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"))