jaseg/gerbonara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix dropped aperture macro names

Browse source
This commit is contained in:
jaseg 2023-04-30 11:27:21 +02:00
parent 26c2460490
commit b50587d6ad
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gerbonara/aperture_macros/parse.py
View file

@ -63,7 +63,7 @@ class ApertureMacro:
object.__setattr__(self, 'name', f'GNX{hash(self)&0xffffffffffffffff:016X}')
@classmethod
def parse_macro(kls, name, body, unit):
def parse_macro(kls, macro_name, body, unit):
comments = []
variables = {}
primitives = []
@ -92,7 +92,7 @@ class ApertureMacro:
primitives.append(ap.PRIMITIVE_CLASSES[int(primitive)].from_arglist(unit, args))
variables = [variables.get(i+1) for i in range(max(variables.keys(), default=0))]
return kls(name, tuple(primitives), tuple(variables), tuple(comments))
return kls(macro_name, tuple(primitives), tuple(variables), tuple(comments))
def __str__(self):
return f'<Aperture macro {self.name}, variables {str(self.variables)}, primitives {self.primitives}>'

1
gerbonara/rs274x.py
View file

@ -126,7 +126,6 @@ class GerberFile(CamFile):
settings = FileSettings.defaults()
cache = {}
macro_cache = {}
macro_names = set()
def lookup(aperture):
nonlocal cache, settings