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

- fixed drill file import from FreePCB

Browse Source
This commit is contained in:
Marius Stanciu
2021-04-05 00:09:33 +03:00
committed by Marius
parent c2677cac26
commit 7cffe87953
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
================================================= =================================================
4.04.2021
- fixed drill file import from FreePCB
1.04.2021 1.04.2021
- fixed bug in the Drilling Tool when there are tools without drill points - fixed bug in the Drilling Tool when there are tools without drill points

10
appParsers/ParseExcellon.py
View File

@@ -327,17 +327,20 @@ class Excellon(Geometry):
self.tools[name_tool] = {} self.tools[name_tool] = {}
if line_units == 'MILS': if line_units == 'MILS':
spec = { spec = {
'tooldia': (float(match.group(2)) / 1000) 'tooldia': (float(match.group(2)) / 1000),
'solid_geometry': []
} }
self.tools[name_tool]['tooldia'] = (float(match.group(2)) / 1000) self.tools[name_tool]['tooldia'] = (float(match.group(2)) / 1000)
self.app.log.debug("Tool definition: %d %s" % (name_tool, spec)) self.app.log.debug("Tool definition: %d %s" % (name_tool, spec))
else: else:
spec = { spec = {
'tooldia': float(match.group(2)) 'tooldia': float(match.group(2)),
'solid_geometry': []
} }
self.tools[name_tool]['tooldia'] = float(match.group(2)) self.tools[name_tool]['tooldia'] = float(match.group(2))
self.app.log.debug("Tool definition: %d %s" % (name_tool, spec)) self.app.log.debug("Tool definition: %d %s" % (name_tool, spec))
spec['solid_geometry'] = []
self.tools[name_tool]['solid_geometry'] = []
continue continue
# search for Altium Excellon Format / Sprint Layout who is included as a comment # search for Altium Excellon Format / Sprint Layout who is included as a comment
match = self.altium_format.search(eline) match = self.altium_format.search(eline)
@@ -881,6 +884,7 @@ class Excellon(Geometry):
self.app.log.warning("UNITS found inline - Value before conversion: %s" % self.units) self.app.log.warning("UNITS found inline - Value before conversion: %s" % self.units)
self.convert_units(self.units) self.convert_units(self.units)
self.app.log.warning("UNITS found inline - Value after conversion: %s" % self.units) self.app.log.warning("UNITS found inline - Value after conversion: %s" % self.units)
if self.units == 'MM': if self.units == 'MM':
self.app.log.warning("Excellon format preset is: %s:%s" % self.app.log.warning("Excellon format preset is: %s:%s" %
(str(self.excellon_format_upper_mm), str(self.excellon_format_lower_mm))) (str(self.excellon_format_upper_mm), str(self.excellon_format_lower_mm)))