From fd9e0d00792256aed5c30d13abf894df31a357c4 Mon Sep 17 00:00:00 2001 From: jaseg Date: Sun, 30 Jan 2022 15:58:20 +0100 Subject: Fix aperture macro outline primitive rendering --- gerbonara/gerber/aperture_macros/expression.py | 6 ++++++ gerbonara/gerber/aperture_macros/parse.py | 5 ++++- gerbonara/gerber/aperture_macros/primitive.py | 14 +++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) (limited to 'gerbonara/gerber/aperture_macros') diff --git a/gerbonara/gerber/aperture_macros/expression.py b/gerbonara/gerber/aperture_macros/expression.py index f25fdd2..0cf055a 100644 --- a/gerbonara/gerber/aperture_macros/expression.py +++ b/gerbonara/gerber/aperture_macros/expression.py @@ -21,6 +21,9 @@ class Expression: def __str__(self): return f'<{self.to_gerber()}>' + def __repr__(self): + return f'' + def converted(self, unit): return self @@ -76,6 +79,9 @@ class UnitExpression(Expression): def __str__(self): return f'<{self._expr.to_gerber()} {self.unit}>' + def __repr__(self): + return f'' + def converted(self, unit): if self.unit is None or unit is None or self.unit == unit: return self._expr diff --git a/gerbonara/gerber/aperture_macros/parse.py b/gerbonara/gerber/aperture_macros/parse.py index 3a6f6e1..0fa936f 100644 --- a/gerbonara/gerber/aperture_macros/parse.py +++ b/gerbonara/gerber/aperture_macros/parse.py @@ -91,7 +91,10 @@ class ApertureMacro: self._name = name def __str__(self): - return f'' + return f'' + + def __repr__(self): + return str(self) def __eq__(self, other): return hasattr(other, 'to_gerber') and self.to_gerber() == other.to_gerber() diff --git a/gerbonara/gerber/aperture_macros/primitive.py b/gerbonara/gerber/aperture_macros/primitive.py index 18aaf51..8732520 100644 --- a/gerbonara/gerber/aperture_macros/primitive.py +++ b/gerbonara/gerber/aperture_macros/primitive.py @@ -48,6 +48,9 @@ class Primitive: attrs = ','.join(str(getattr(self, name)).strip('<>') for name in type(self).__annotations__) return f'<{type(self).__name__} {attrs}>' + def __repr__(self): + return str(self) + class Calculator: def __init__(self, instance, variable_binding={}, unit=None): self.instance = instance @@ -222,18 +225,19 @@ class Outline(Primitive): self.coords = [(UnitExpression(x, unit), UnitExpression(y, unit)) for x, y in zip(args[0::2], args[1::2])] + def __str__(self): + return f'' + def to_gerber(self, unit=None): 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)-1},{coords},{self.rotation.to_gerber()}' def to_graphic_primitives(self, offset, rotation, variable_binding={}, unit=None, polarity_dark=True): with self.Calculator(self, variable_binding, unit) as calc: - bound_coords = [ (calc(x)+offset[0], calc(y)+offset[1]) for x, y in self.coords ] - bound_radii = [None] * len(bound_coords) - rotation += deg_to_rad(calc.rotation) - bound_coords = [ gp.rotate_point(*p, rotation, 0, 0) for p in bound_coords ] - + bound_coords = [ gp.rotate_point(calc(x), calc(y), rotation, 0, 0) for x, y in self.coords ] + bound_coords = [ (x+offset[0], y+offset[1]) for x, y in bound_coords ] + bound_radii = [None] * len(bound_coords) return [gp.ArcPoly(bound_coords, bound_radii, polarity_dark=(bool(calc.exposure) == polarity_dark))] def dilate(self, offset, unit): -- cgit