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

- fixed Extract Drills Tool to work with the new Excellon data format

Browse Source
This commit is contained in:
Marius Stanciu
2020-06-16 12:40:11 +03:00
committed by Marius
parent 441b553fa8
commit 6ec57391f4
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta
- fixed all transformations in the Excellon object attributes; still need to fix the App Tools that creates or use Exellon objects - fixed all transformations in the Excellon object attributes; still need to fix the App Tools that creates or use Exellon objects
- fixed some problems (typos, missing data) generated by latest changes - fixed some problems (typos, missing data) generated by latest changes
- more typos fixed in Excellon parser, slots processing - more typos fixed in Excellon parser, slots processing
- fixed Extract Drills Tool to work with the new Excellon data format
15.06.2020 15.06.2020

52
appTools/ToolExtractDrills.py
View File

@@ -441,7 +441,13 @@ class ToolExtractDrills(AppTool):
mode = self.hole_size_radio.get_value() mode = self.hole_size_radio.get_value()
if mode == 'fixed': if mode == 'fixed':
tools = {"1": {"C": drill_dia}} tools = {
1: {
"tooldia": drill_dia,
"drills": [],
"slots": []
}
}
for apid, apid_value in fcobj.apertures.items(): for apid, apid_value in fcobj.apertures.items():
ap_type = apid_value['type'] ap_type = apid_value['type']
@@ -468,13 +474,13 @@ class ToolExtractDrills(AppTool):
for geo_el in apid_value['geometry']: for geo_el in apid_value['geometry']:
if 'follow' in geo_el and isinstance(geo_el['follow'], Point): if 'follow' in geo_el and isinstance(geo_el['follow'], Point):
drills.append({"point": geo_el['follow'], "tool": "1"}) tools[1]["drills"].append(geo_el['follow'])
if 'solid_geometry' not in tools["1"]: if 'solid_geometry' not in tools[1]:
tools["1"]['solid_geometry'] = [] tools[1]['solid_geometry'] = []
else: else:
tools["1"]['solid_geometry'].append(geo_el['follow']) tools[1]['solid_geometry'].append(geo_el['follow'])
if 'solid_geometry' not in tools["1"] or not tools["1"]['solid_geometry']: if 'solid_geometry' not in tools[1] or not tools[1]['solid_geometry']:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("No drills extracted. Try different parameters.")) self.app.inform.emit('[WARNING_NOTCL] %s' % _("No drills extracted. Try different parameters."))
return return
elif mode == 'ring': elif mode == 'ring':
@@ -530,23 +536,28 @@ class ToolExtractDrills(AppTool):
tool_in_drills = False tool_in_drills = False
for tool, tool_val in tools.items(): for tool, tool_val in tools.items():
if abs(float('%.*f' % (self.decimals, tool_val["tooldia"])) - float('%.*f' % (self.decimals, dia))) < \ if abs(float('%.*f' % (
(10 ** -self.decimals): self.decimals,
tool_val["tooldia"])) - float('%.*f' % (self.decimals, dia))) < (10 ** -self.decimals):
tool_in_drills = tool tool_in_drills = tool
if tool_in_drills is False: if tool_in_drills is False:
if tools: if tools:
new_tool = max([int(t) for t in tools]) + 1 new_tool = max([int(t) for t in tools]) + 1
tool_in_drills = str(new_tool) tool_in_drills = new_tool
else: else:
tool_in_drills = "1" tool_in_drills = 1
for geo_el in apid_value['geometry']: for geo_el in apid_value['geometry']:
if 'follow' in geo_el and isinstance(geo_el['follow'], Point): if 'follow' in geo_el and isinstance(geo_el['follow'], Point):
if tool_in_drills not in tools: if tool_in_drills not in tools:
tools[tool_in_drills] = {"C": dia} tools[tool_in_drills] = {
"tooldia": dia,
"drills": [],
"slots": []
}
drills.append({"point": geo_el['follow'], "tool": tool_in_drills}) tools[tool_in_drills]['drills'].append(geo_el['follow'])
if 'solid_geometry' not in tools[tool_in_drills]: if 'solid_geometry' not in tools[tool_in_drills]:
tools[tool_in_drills]['solid_geometry'] = [] tools[tool_in_drills]['solid_geometry'] = []
@@ -615,23 +626,28 @@ class ToolExtractDrills(AppTool):
tool_in_drills = False tool_in_drills = False
for tool, tool_val in tools.items(): for tool, tool_val in tools.items():
if abs(float('%.*f' % (self.decimals, tool_val["tooldia"])) - float('%.*f' % (self.decimals, dia))) < \ if abs(float('%.*f' % (
(10 ** -self.decimals): self.decimals,
tool_val["tooldia"])) - float('%.*f' % (self.decimals, dia))) < (10 ** -self.decimals):
tool_in_drills = tool tool_in_drills = tool
if tool_in_drills is False: if tool_in_drills is False:
if tools: if tools:
new_tool = max([int(t) for t in tools]) + 1 new_tool = max([int(t) for t in tools]) + 1
tool_in_drills = str(new_tool) tool_in_drills = new_tool
else: else:
tool_in_drills = "1" tool_in_drills = 1
for geo_el in apid_value['geometry']: for geo_el in apid_value['geometry']:
if 'follow' in geo_el and isinstance(geo_el['follow'], Point): if 'follow' in geo_el and isinstance(geo_el['follow'], Point):
if tool_in_drills not in tools: if tool_in_drills not in tools:
tools[tool_in_drills] = {"C": dia} tools[tool_in_drills] = {
"tooldia": dia,
"drills": [],
"slots": []
}
drills.append({"point": geo_el['follow'], "tool": tool_in_drills}) tools[tool_in_drills]['drills'].append(geo_el['follow'])
if 'solid_geometry' not in tools[tool_in_drills]: if 'solid_geometry' not in tools[tool_in_drills]:
tools[tool_in_drills]['solid_geometry'] = [] tools[tool_in_drills]['solid_geometry'] = []