- added the file extension .ncd to the Excellon file extension list

- solved parsing issue for Excellon files generated by older Eagle versions (v6.x)
This commit is contained in:
Marius Stanciu 2019-05-21 16:13:36 +03:00 committed by Marius
parent 511df19793
commit 4f2e5643d9
3 changed files with 8 additions and 2 deletions

View File

@ -1905,7 +1905,7 @@ class App(QtCore.QObject):
'dim', 'mil', 'grb', 'top', 'bot', 'smt', 'smb', 'sst', 'ssb', 'spt', 'spb', 'pho', 'gdo', 'dim', 'mil', 'grb', 'top', 'bot', 'smt', 'smb', 'sst', 'ssb', 'spt', 'spb', 'pho', 'gdo',
'art', 'gbd', 'gb0', 'gb1', 'gb2', 'gb3', 'g4', 'gb5', 'gb6', 'gb7', 'gb8', 'gb9' 'art', 'gbd', 'gb0', 'gb1', 'gb2', 'gb3', 'g4', 'gb5', 'gb6', 'gb7', 'gb8', 'gb9'
] ]
self.exc_list = ['drl', 'txt', 'xln', 'drd', 'tap', 'exc'] self.exc_list = ['drl', 'txt', 'xln', 'drd', 'tap', 'exc', 'ncd']
self.gcode_list = ['nc', 'ncc', 'tap', 'gcode', 'cnc', 'ecs', 'fnc', 'dnc', 'ncg', 'gc', 'fan', 'fgc', 'din', self.gcode_list = ['nc', 'ncc', 'tap', 'gcode', 'cnc', 'ecs', 'fnc', 'dnc', 'ncg', 'gc', 'fan', 'fgc', 'din',
'xpi', 'hnc', 'h', 'i', 'ncp', 'min', 'gcd', 'rol', 'mpr', 'ply', 'out', 'eia', 'plt', 'sbp', 'xpi', 'hnc', 'h', 'i', 'ncp', 'min', 'gcd', 'rol', 'mpr', 'ply', 'out', 'eia', 'plt', 'sbp',
'mpf'] 'mpf']
@ -5945,7 +5945,7 @@ class App(QtCore.QObject):
self.report_usage("on_fileopenexcellon") self.report_usage("on_fileopenexcellon")
App.log.debug("on_fileopenexcellon()") App.log.debug("on_fileopenexcellon()")
_filter_ = "Excellon Files (*.drl *.txt *.xln *.drd *.tap *.exc);;" \ _filter_ = "Excellon Files (*.drl *.txt *.xln *.drd *.tap *.exc *.ncd);;" \
"All Files (*.*)" "All Files (*.*)"
try: try:

View File

@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
21.05.2019
- added the file extension .ncd to the Excellon file extension list
- solved parsing issue for Excellon files generated by older Eagle versions (v6.x)
20.05.2019 20.05.2019
- more PEP8 changes in Gerber editor - more PEP8 changes in Gerber editor

View File

@ -3878,6 +3878,7 @@ class Excellon(Geometry):
# Header Begin (M48) # # Header Begin (M48) #
if self.hbegin_re.search(eline): if self.hbegin_re.search(eline):
in_header = True in_header = True
headerless = False
log.warning("Found start of the header: %s" % eline) log.warning("Found start of the header: %s" % eline)
continue continue