diff options
| author | jaseg <git@jaseg.de> | 2022-01-22 20:51:22 +0100 |
|---|---|---|
| committer | jaseg <git@jaseg.de> | 2022-01-22 20:51:22 +0100 |
| commit | bf5a2968e227af90c9742a585939583f5d3da738 (patch) | |
| tree | c2b8e1ffc6bcd8c273cc461228659429f7de39fd /gerbonara/gerber/aperture_macros | |
| parent | eae43a579e128b29cd10f645837efba5bf0a3b40 (diff) | |
| download | gerbonara-bf5a2968e227af90c9742a585939583f5d3da738.tar.gz gerbonara-bf5a2968e227af90c9742a585939583f5d3da738.tar.bz2 gerbonara-bf5a2968e227af90c9742a585939583f5d3da738.zip | |
Fix a bunch of bugs
Diffstat (limited to 'gerbonara/gerber/aperture_macros')
| -rw-r--r-- | gerbonara/gerber/aperture_macros/parse.py | 2 | ||||
| -rw-r--r-- | gerbonara/gerber/aperture_macros/primitive.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gerbonara/gerber/aperture_macros/parse.py b/gerbonara/gerber/aperture_macros/parse.py index c1aa2d0..2126e0f 100644 --- a/gerbonara/gerber/aperture_macros/parse.py +++ b/gerbonara/gerber/aperture_macros/parse.py @@ -94,7 +94,7 @@ class ApertureMacro: return f'<Aperture macro, variables {str(self.variables)}, primitives {self.primitives}>' def __eq__(self, other): - return hasattr(other, to_gerber) and self.to_gerber() == other.to_gerber() + return hasattr(other, 'to_gerber') and self.to_gerber() == other.to_gerber() def __hash__(self): return hash(self.to_gerber()) diff --git a/gerbonara/gerber/aperture_macros/primitive.py b/gerbonara/gerber/aperture_macros/primitive.py index 76268d2..7832960 100644 --- a/gerbonara/gerber/aperture_macros/primitive.py +++ b/gerbonara/gerber/aperture_macros/primitive.py @@ -223,7 +223,7 @@ class Outline(Primitive): self.coords = [(UnitExpression(x, unit), UnitExpression(y, unit)) for x, y in zip(args[1::2], args[2::2])] def to_gerber(self, unit=None): - coords = ','.join(coord.to_gerber(unit) for coord in self.coords) + coords = ','.join(coord.to_gerber(unit) for xy in self.coords for coord in xy) return f'{self.code},{self.exposure.to_gerber()},{len(self.coords)//2-1},{coords},{self.rotation.to_gerber()}' def to_graphic_primitives(self, offset, rotation, variable_binding={}, unit=None): |