summaryrefslogtreecommitdiff
path: root/gerbonara/gerber/rs274x.py
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2022-01-29 02:42:29 +0100
committerjaseg <git@jaseg.de>2022-01-29 02:42:29 +0100
commit35f24607fe65385370cd6e267ea5afffbfbd1e34 (patch)
tree9958f1cf3f4b78d58ad84ad34464c130957cd03e /gerbonara/gerber/rs274x.py
parent39756077b4930b1eee4c029dbce1dacb23a21559 (diff)
downloadgerbonara-35f24607fe65385370cd6e267ea5afffbfbd1e34.tar.gz
gerbonara-35f24607fe65385370cd6e267ea5afffbfbd1e34.tar.bz2
gerbonara-35f24607fe65385370cd6e267ea5afffbfbd1e34.zip
Layer matcher WIP
Diffstat (limited to 'gerbonara/gerber/rs274x.py')
-rw-r--r--gerbonara/gerber/rs274x.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/gerbonara/gerber/rs274x.py b/gerbonara/gerber/rs274x.py
index 5973ead..07dbac4 100644
--- a/gerbonara/gerber/rs274x.py
+++ b/gerbonara/gerber/rs274x.py
@@ -53,9 +53,9 @@ class GerberFile(CamFile):
The GerberFile class represents a single gerber file.
"""
- def __init__(self, objects=None, comments=None, import_settings=None, filename=None, generator_hints=None,
+ def __init__(self, objects=None, comments=None, import_settings=None, original_path=None, generator_hints=None,
layer_hints=None, file_attrs=None):
- super().__init__(filename=filename)
+ super().__init__(original_path=original_path)
self.objects = objects or []
self.comments = comments or []
self.generator_hints = generator_hints or []
@@ -157,7 +157,7 @@ class GerberFile(CamFile):
with open(filename, "r") as f:
if enable_includes and enable_include_dir is None:
enable_include_dir = filename.parent
- return kls.from_string(f.read(), enable_include_dir, filename=filename.name)
+ return kls.from_string(f.read(), enable_include_dir, filename=filename)
@classmethod
def from_string(kls, data, enable_include_dir=None, filename=None):
@@ -217,7 +217,8 @@ class GerberFile(CamFile):
yield 'M02*'
def __str__(self):
- return f'<GerberFile with {len(self.apertures)} apertures, {len(self.objects)} objects>'
+ name = f'{self.original_path.name} ' if self.original_path else ''
+ return f'<GerberFile {name}with {len(self.apertures)} apertures, {len(self.objects)} objects>'
def save(self, filename, settings=None, drop_comments=True):
with open(filename, 'w', encoding='utf-8') as f: # Encoding is specified as UTF-8 by spec.
@@ -637,6 +638,7 @@ class GerberParser:
self.target.import_settings = self.file_settings
self.target.unit = self.file_settings.unit
self.target.file_attrs = self.file_attrs
+ self.target.original_path = filename
if not self.eof_found:
self.warn('File is missing mandatory M02 EOF marker. File may be truncated.')