diff --git a/.gitignore b/.gitignore index 7170c77..f5927cd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,3 @@ gerbonara_test_failures __pycache__ .tox docs/_build/ -build -dist diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47d8710..1cb51ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,54 +14,53 @@ build:archlinux: GIT_SUBMODULE_STRATEGY: none script: - git config --global --add safe.directory "$CI_PROJECT_DIR" - - uv build + - pip3 install --user wheel setuptools + - python3 setup.py sdist bdist_wheel artifacts: name: "gerbolyze-$CI_COMMIT_REF_NAME-gerbonara" paths: - dist/* -# FIXME: disable tests since (a) currenty kicad-cli is broken (aborts on start), and the workaround of using an older -# version from the KiCad project's kicad-cli containers does not work in gitlab CI. Pain. -#test:archlinux: -# stage: test -# image: "registry.gitlab.com/gerbolyze/build-containers/archlinux:latest" -# script: -# - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-symbols -# - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-footprints -# - env KICAD_SYMBOLS=kicad-symbols KICAD_FOOTPRINTS=kicad-footprints pytest -o 'testpaths=gerbonara/tests' -o 'norecursedirs=*' -# dependencies: -# - build:archlinux -# cache: -# key: test-image-cache -# paths: -# - gerbonara/tests/image_cache/*.svg -# - gerbonara/tests/image_cache/*.png -# artifacts: -# name: "gerbolyze-$CI_COMMIT_REF_NAME-gerbonara" -# when: on_failure -# paths: -# - gerbonara_test_failures/* -# -#test:ubuntu-rolling: -# stage: test -# image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:rolling" -# script: -# - python3 -m pip install --break-system-packages pytest beautifulsoup4 pillow numpy slugify lxml click scipy -# - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-symbols -# - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-footprints -# - env KICAD_SYMBOLS=kicad-symbols KICAD_FOOTPRINTS=kicad-footprints python3 -m pytest -o 'testpaths=gerbonara/tests' -o 'norecursedirs=*' -# dependencies: -# - build:archlinux -# cache: -# key: test-image-cache -# paths: -# - gerbonara/tests/image_cache/*.svg -# - gerbonara/tests/image_cache/*.png -# artifacts: -# name: "gerbolyze-$CI_COMMIT_REF_NAME-gerbonara" -# when: on_failure -# paths: -# - gerbonara_test_failures/* +test:archlinux: + stage: test + image: "registry.gitlab.com/gerbolyze/build-containers/archlinux:latest" + script: + - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-symbols + - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-footprints + - env KICAD_SYMBOLS=kicad-symbols KICAD_FOOTPRINTS=kicad-footprints pytest -o 'testpaths=gerbonara/tests' -o 'norecursedirs=*' + dependencies: + - build:archlinux + cache: + key: test-image-cache + paths: + - gerbonara/tests/image_cache/*.svg + - gerbonara/tests/image_cache/*.png + artifacts: + name: "gerbolyze-$CI_COMMIT_REF_NAME-gerbonara" + when: on_failure + paths: + - gerbonara_test_failures/* + +test:ubuntu2204: + stage: test + image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:22.04" + script: + - python3 -m pip install pytest beautifulsoup4 pillow numpy slugify lxml click scipy + - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-symbols + - git clone --depth 1 https://gitlab.com/kicad/libraries/kicad-footprints + - env KICAD_SYMBOLS=kicad-symbols KICAD_FOOTPRINTS=kicad-footprints python3 -m pytest -o 'testpaths=gerbonara/tests' -o 'norecursedirs=*' + dependencies: + - build:archlinux + cache: + key: test-image-cache + paths: + - gerbonara/tests/image_cache/*.svg + - gerbonara/tests/image_cache/*.png + artifacts: + name: "gerbolyze-$CI_COMMIT_REF_NAME-gerbonara" + when: on_failure + paths: + - gerbonara_test_failures/* docs:archlinux: stage: test @@ -84,7 +83,7 @@ publish:gerbonara: cache: {} script: - export TWINE_USERNAME TWINE_PASSWORD - - pip3 install --user --break-system-packages twine rich + - pip3 install --user twine rich - twine upload dist/* dependencies: - build:archlinux diff --git a/docs/cli.rst b/docs/cli.rst index 02c8a01..8eb1ff3 100644 --- a/docs/cli.rst +++ b/docs/cli.rst @@ -60,7 +60,6 @@ layers, or whole board stacks (:py:class:`~.layers.LayerStack`) to SVG. ``gerbonara render`` renders one or more Gerber or Excellon files as a single SVG file. It can read single files, directorys of files, and ZIP files. To read directories or zips, it applies gerbonara's layer filename matching rules. -These built-in rules should work with common settings in a wide variety of CAD tools. .. option:: --warnings [default|ignore|once] diff --git a/docs/index.rst b/docs/index.rst index 22c2361..71d91ec 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -71,7 +71,7 @@ Then, you are ready to read and write gerber files: from gerbonara import LayerStack - stack = LayerStack.open('output/gerber') + stack = LayerStack.from_directory('output/gerber') w, h = stack.outline.size('mm') print(f'Board size is {w:.1f} mm x {h:.1f} mm') diff --git a/examples/highlight_outline.py b/examples/highlight_outline.py index 0f600e3..9d89ce2 100644 --- a/examples/highlight_outline.py +++ b/examples/highlight_outline.py @@ -10,7 +10,7 @@ from gerbonara.utils import MM from gerbonara.utils import rotate_point def highlight_outline(input_dir, output_dir): - stack = LayerStack.open(input_dir) + stack = LayerStack.from_directory(input_dir) outline = [] for obj in stack.outline.objects: @@ -28,6 +28,7 @@ def highlight_outline(input_dir, output_dir): marker_nx, marker_ny = math.sin(marker_angle), math.cos(marker_angle) ap = CircleAperture(0.1, unit=MM) + stack['top silk'].apertures.append(ap) for line in outline: cx, cy = (line.x1 + line.x2)/2, (line.y1 + line.y2)/2 diff --git a/examples/load_directory.py b/examples/load_directory.py index a23f519..6e1f901 100644 --- a/examples/load_directory.py +++ b/examples/load_directory.py @@ -7,5 +7,5 @@ if __name__ == '__main__': args = parser.parse_args() import gerbonara - print(gerbonara.LayerStack.open(args.input)) + print(gerbonara.LayerStack.from_directory(args.input)) diff --git a/examples/test_arc_approx.py b/examples/test_arc_approx.py index a93864a..76d4116 100644 --- a/examples/test_arc_approx.py +++ b/examples/test_arc_approx.py @@ -2,7 +2,6 @@ import math -from gerbonara.utils import MM from gerbonara.graphic_objects import Arc from gerbonara.graphic_objects import rotate_point @@ -23,8 +22,7 @@ def approx_test(): x1, y1 = rotate_point(0, -1, start_angle*eps) x2, y2 = rotate_point(x1, y1, sweep_angle*eps*(-1 if clockwise else 1)) - arc = Arc(x1+cx, y1+cy, x2+cx, y2+cy, -x1, -y1, clockwise=clockwise, aperture=None, - polarity_dark=True, unit=MM) + arc = Arc(x1+cx, y1+cy, x2+cx, y2+cy, -x1, -y1, clockwise=clockwise, aperture=None, polarity_dark=True) lines = arc.approximate(max_error=max_error) print(f' + +from dataclasses import dataclass, field, replace +import operator +import re +import ast +import copy +import math + +from . import primitive as ap +from .expression import * +from ..utils import MM + +# we make our own here instead of using math.degrees to make sure this works with expressions, too. +def rad_to_deg(x): + return (x / math.pi) * 180 + +def _map_expression(node): + if isinstance(node, ast.Num): + return ConstantExpression(node.n) + + elif isinstance(node, ast.BinOp): + op_map = {ast.Add: operator.add, ast.Sub: operator.sub, ast.Mult: operator.mul, ast.Div: operator.truediv} + return OperatorExpression(op_map[type(node.op)], _map_expression(node.left), _map_expression(node.right)) + + elif isinstance(node, ast.UnaryOp): + if type(node.op) == ast.UAdd: + return _map_expression(node.operand) + else: + return OperatorExpression(operator.sub, ConstantExpression(0), _map_expression(node.operand)) + + elif isinstance(node, ast.Name): + return VariableExpression(int(node.id[3:])) # node.id has format var[0-9]+ + + else: + raise SyntaxError('Invalid aperture macro expression') + +def _parse_expression(expr): + expr = expr.lower().replace('x', '*') + expr = re.sub(r'\$([0-9]+)', r'var\1', expr) + try: + parsed = ast.parse(expr, mode='eval').body + except SyntaxError as e: + raise SyntaxError('Invalid aperture macro expression') from e + return _map_expression(parsed) + +@dataclass(frozen=True, slots=True) +class ApertureMacro: + name: str = field(default=None, hash=False, compare=False) + primitives: tuple = () + variables: tuple = () + comments: tuple = field(default=(), hash=False, compare=False) + + def __post_init__(self): + if self.name is None or re.match(r'GNX[0-9A-F]{16}', self.name): + # We can't use field(default_factory=...) here because that factory doesn't get a reference to the instance. + self._reset_name() + + def _reset_name(self): + object.__setattr__(self, 'name', f'GNX{hash(self)&0xffffffffffffffff:016X}') + + @classmethod + def parse_macro(kls, macro_name, body, unit): + comments = [] + variables = {} + primitives = [] + + blocks = body.split('*') + for block in blocks: + if not (block := block.strip()): # empty block + continue + + if block.startswith('0 '): # comment + comments.append(block[2:]) + continue + + block = re.sub(r'\s', '', block) + + if block[0] == '$': # variable definition + name, expr = block.partition('=') + number = int(name[1:]) + if number in variables: + raise SyntaxError(f'Re-definition of aperture macro variable {number} inside macro') + variables[number] = _parse_expression(expr) + + else: # primitive + primitive, *args = block.split(',') + args = [ _parse_expression(arg) for arg in args ] + 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(macro_name, tuple(primitives), tuple(variables), tuple(comments)) + + def __str__(self): + return f'' + + def __repr__(self): + return str(self) + + def dilated(self, offset, unit=MM): + new_primitives = [] + for primitive in self.primitives: + try: + if primitive.exposure.calculate(): + new_primitives += primitive.dilated(offset, unit) + except IndexError: + warnings.warn('Cannot dilate aperture macro primitive with exposure value computed from macro variable.') + pass + return replace(self, primitives=tuple(new_primitives)) + + def to_gerber(self, unit=None): + """ Serialize this macro's content (without the name) into Gerber using the given file unit """ + comments = [ f'0 {c.replace("*", "_").replace("%", "_")}' for c in self.comments ] + variable_defs = [ f'${var}={str(expr)[1:-1]}' for var, expr in enumerate(self.variables, start=1) if expr is not None ] + primitive_defs = [ prim.to_gerber(unit) for prim in self.primitives ] + return '*\n'.join(comments + variable_defs + primitive_defs) + + def to_graphic_primitives(self, offset, rotation, parameters : [float], unit=None, polarity_dark=True): + variables = {i: v for i, v in enumerate(self.variables, start=1) if v is not None} + for number, value in enumerate(parameters, start=1): + if number in variables: + raise SyntaxError(f'Re-definition of aperture macro variable {number} through parameter {value}') + variables[number] = value + + for primitive in self.primitives: + yield from primitive.to_graphic_primitives(offset, rotation, variables, unit, polarity_dark) + + def rotated(self, angle): + # aperture macro primitives use degree counter-clockwise, our API uses radians clockwise + return replace(self, primitives=tuple( + replace(primitive, rotation=primitive.rotation - rad_to_deg(angle)) for primitive in self.primitives)) + + def scaled(self, scale): + return replace(self, primitives=tuple( + primitive.scaled(scale) for primitive in self.primitives)) + + +var = VariableExpression +deg_per_rad = 180 / math.pi + +class GenericMacros: + + _generic_hole = lambda n: (ap.Circle('mm', 0, var(n), 0, 0),) + + # NOTE: All generic macros have rotation values specified in **clockwise radians** like the rest of the user-facing + # API. + circle = ApertureMacro('GNC', ( + ap.Circle('mm', 1, var(1), 0, 0, var(4) * -deg_per_rad), + *_generic_hole(2))) + + rect = ApertureMacro('GNR', ( + ap.CenterLine('mm', 1, var(1), var(2), 0, 0, var(5) * -deg_per_rad), + *_generic_hole(3))) + + # params: width, height, corner radius, *hole, rotation + rounded_rect = ApertureMacro('GRR', ( + ap.CenterLine('mm', 1, var(1)-2*var(3), var(2), 0, 0, var(6) * -deg_per_rad), + ap.CenterLine('mm', 1, var(1), var(2)-2*var(3), 0, 0, var(6) * -deg_per_rad), + ap.Circle('mm', 1, var(3)*2, +(var(1)/2-var(3)), +(var(2)/2-var(3)), var(6) * -deg_per_rad), + ap.Circle('mm', 1, var(3)*2, +(var(1)/2-var(3)), -(var(2)/2-var(3)), var(6) * -deg_per_rad), + ap.Circle('mm', 1, var(3)*2, -(var(1)/2-var(3)), +(var(2)/2-var(3)), var(6) * -deg_per_rad), + ap.Circle('mm', 1, var(3)*2, -(var(1)/2-var(3)), -(var(2)/2-var(3)), var(6) * -deg_per_rad), + *_generic_hole(4))) + + # params: width, height, length difference between narrow side (top) and wide side (bottom), *hole, rotation + isosceles_trapezoid = ApertureMacro('GTR', ( + ap.Outline('mm', 1, 4, + (var(1)/-2, var(2)/-2, + var(1)/-2+var(3)/2, var(2)/2, + var(1)/2-var(3)/2, var(2)/2, + var(1)/2, var(2)/-2, + var(1)/-2, var(2)/-2,), + var(6) * -deg_per_rad), + *_generic_hole(4))) + + # params: width, height, length difference between narrow side (top) and wide side (bottom), margin, *hole, rotation + rounded_isosceles_trapezoid = ApertureMacro('GRTR', ( + ap.Outline('mm', 1, 4, + (var(1)/-2, var(2)/-2, + var(1)/-2+var(3)/2, var(2)/2, + var(1)/2-var(3)/2, var(2)/2, + var(1)/2, var(2)/-2, + var(1)/-2, var(2)/-2,), + var(6) * -deg_per_rad), + ap.VectorLine('mm', 1, var(4)*2, + var(1)/-2, var(2)/-2, + var(1)/-2+var(3)/2, var(2)/2,), + ap.VectorLine('mm', 1, var(4)*2, + var(1)/-2+var(3)/2, var(2)/2, + var(1)/2-var(3)/2, var(2)/2,), + ap.VectorLine('mm', 1, var(4)*2, + var(1)/2-var(3)/2, var(2)/2, + var(1)/2, var(2)/-2,), + ap.VectorLine('mm', 1, var(4)*2, + var(1)/2, var(2)/-2, + var(1)/-2, var(2)/-2,), + ap.Circle('mm', 1, var(4)*2, + var(1)/-2, var(2)/-2,), + ap.Circle('mm', 1, var(4)*2, + var(1)/-2+var(3)/2, var(2)/2,), + ap.Circle('mm', 1, var(4)*2, + var(1)/2-var(3)/2, var(2)/2,), + ap.Circle('mm', 1, var(4)*2, + var(1)/2, var(2)/-2,), + *_generic_hole(5))) + + # w must be larger than h + # params: width, height, *hole, rotation + obround = ApertureMacro('GNO', ( + ap.CenterLine('mm', 1, var(1)-var(2), var(2), 0, 0, var(5) * -deg_per_rad), + ap.Circle('mm', 1, var(2), +(var(1)-var(2))/2, 0, var(5) * -deg_per_rad), + ap.Circle('mm', 1, var(2), -(var(1)-var(2))/2, 0, var(5) * -deg_per_rad), + *_generic_hole(3) )) + + polygon = ApertureMacro('GNP', ( + ap.Polygon('mm', 1, var(2), 0, 0, var(1), var(3) * -deg_per_rad), + ap.Circle('mm', 0, var(4), 0, 0))) + + +if __name__ == '__main__': + import sys + #for line in sys.stdin: + #expr = _parse_expression(line.strip()) + #print(expr, '->', expr.optimized()) + + for primitive in parse_macro(sys.stdin.read(), 'mm'): + print(primitive) + diff --git a/src/gerbonara/aperture_macros/primitive.py b/gerbonara/aperture_macros/primitive.py similarity index 65% rename from src/gerbonara/aperture_macros/primitive.py rename to gerbonara/aperture_macros/primitive.py index d31aef8..f575b0c 100644 --- a/src/gerbonara/aperture_macros/primitive.py +++ b/gerbonara/aperture_macros/primitive.py @@ -7,7 +7,7 @@ import warnings import contextlib import math -from dataclasses import dataclass, fields, replace +from dataclasses import dataclass, fields from .expression import Expression, UnitExpression, ConstantExpression, expr @@ -34,6 +34,7 @@ def rad_to_deg(a): @dataclass(frozen=True, slots=True) class Primitive: unit: LengthUnit + exposure : Expression def __post_init__(self): for field in fields(self): @@ -45,16 +46,9 @@ class Primitive: elif field.type == Expression: object.__setattr__(self, field.name, expr(getattr(self, field.name))) - def to_gerber(self, register_variable=None, settings=None): + def to_gerber(self, unit=None): return f'{self.code},' + ','.join( - getattr(self, field.name).optimized().to_gerber(register_variable, settings.unit) - for field in fields(self) if issubclass(field.type, Expression)) - - def substitute_params(self, binding, unit): - out = replace(self, unit=unit, **{ - field.name: getattr(self, field.name).calculate(binding, unit) - for field in fields(self) if issubclass(field.type, Expression)}) - return out + getattr(self, field.name).to_gerber(unit) for field in fields(self) if field.name != 'unit') def __str__(self): attrs = ','.join(str(getattr(self, name)).strip('<>') for name in type(self).__annotations__) @@ -67,11 +61,6 @@ class Primitive: def from_arglist(kls, unit, arglist): return kls(unit, *arglist) - def parameters(self): - for field in fields(self): - if issubclass(field.type, Expression): - yield from getattr(self, field.name).parameters() - class Calculator: def __init__(self, instance, variable_binding={}, unit=None): self.instance = instance @@ -94,29 +83,18 @@ class Primitive: @dataclass(frozen=True, slots=True) class Circle(Primitive): code = 1 - exposure : Expression diameter : UnitExpression # center x/y - x : UnitExpression = 0 - y : UnitExpression = 0 + x : UnitExpression + y : UnitExpression rotation : Expression = 0 def to_graphic_primitives(self, offset, rotation, variable_binding={}, unit=None, polarity_dark=True): with self.Calculator(self, variable_binding, unit) as calc: x, y = rotate_point(calc.x, calc.y, -(deg_to_rad(calc.rotation) + rotation), 0, 0) x, y = x+offset[0], y+offset[1] - - if math.isclose(calc.diameter, 0): - return [] - return [ gp.Circle(x, y, calc.diameter/2, polarity_dark=(bool(calc.exposure) == polarity_dark)) ] - def substitute_params(self, binding, unit): - with self.Calculator(self, binding, unit) as calc: - x, y = rotate_point(calc.x, calc.y, -deg_to_rad(calc.rotation), 0, 0) - new = Circle(unit, self.exposure, calc.diameter, x, y) - return new - def dilated(self, offset, unit): return replace(self, diameter=self.diameter + UnitExpression(offset, unit)) @@ -128,7 +106,6 @@ class Circle(Primitive): @dataclass(frozen=True, slots=True) class VectorLine(Primitive): code = 20 - exposure : Expression width : UnitExpression start_x : UnitExpression start_y : UnitExpression @@ -148,18 +125,9 @@ class VectorLine(Primitive): center_x, center_y = center_x+offset[0], center_y+offset[1] rotation += deg_to_rad(calc.rotation) + math.atan2(delta_y, delta_x) - if math.isclose(calc.width, 0): - return [] - return [ gp.Rectangle(center_x, center_y, length, calc.width, rotation=rotation, polarity_dark=(bool(calc.exposure) == polarity_dark)) ] - def substitute_params(self, binding, unit): - with self.Calculator(self, binding, unit) as calc: - x1, y1 = rotate_point(calc.start_x, calc.start_y, -deg_to_rad(calc.rotation), 0, 0) - x2, y2 = rotate_point(calc.end_x, calc.end_y, -deg_to_rad(calc.rotation), 0, 0) - return VectorLine(unit, calc.exposure, calc.width, x1, y1, x2, y2) - def dilated(self, offset, unit): return replace(self, width=self.width + UnitExpression(2*offset, unit)) @@ -174,7 +142,6 @@ class VectorLine(Primitive): @dataclass(frozen=True, slots=True) class CenterLine(Primitive): code = 21 - exposure : Expression width : UnitExpression height : UnitExpression # center x/y @@ -189,17 +156,8 @@ class CenterLine(Primitive): x, y = x+offset[0], y+offset[1] w, h = calc.width, calc.height - if math.isclose(calc.width, 0) or math.isclose(calc.height, 0): - return [] - return [ gp.Rectangle(x, y, w, h, rotation, polarity_dark=(bool(calc.exposure) == polarity_dark)) ] - def substitute_params(self, binding, unit): - with self.Calculator(self, binding, unit) as calc: - x1, y1 = rotate_point(calc.x, calc.y-calc.height/2, -deg_to_rad(calc.rotation), 0, 0) - x2, y2 = rotate_point(calc.x, calc.y+calc.height/2, -deg_to_rad(calc.rotation), 0, 0) - return VectorLine(unit, calc.exposure, calc.width, x1, y1, x2, y2) - def dilated(self, offset, unit): return replace(self, width=self.width + UnitExpression(2*offset, unit)) @@ -214,7 +172,6 @@ class CenterLine(Primitive): @dataclass(frozen=True, slots=True) class Polygon(Primitive): code = 5 - exposure : Expression n_vertices : Expression # center x/y x : UnitExpression @@ -227,8 +184,7 @@ class Polygon(Primitive): rotation += deg_to_rad(calc.rotation) x, y = rotate_point(calc.x, calc.y, -rotation, 0, 0) x, y = x+offset[0], y+offset[1] - print('xy', calc.x, calc.y) - return [ gp.ArcPoly.from_regular_polygon(x, y, calc.diameter/2, int(calc.n_vertices), rotation, + return [ gp.ArcPoly.from_regular_polygon(calc.x, calc.y, calc.diameter/2, calc.n_vertices, rotation, polarity_dark=(bool(calc.exposure) == polarity_dark)) ] def dilated(self, offset, unit): @@ -241,60 +197,9 @@ class Polygon(Primitive): y=self.y * UnitExpression(scale)) -@dataclass(frozen=True, slots=True) -class Moire(Primitive): - """ Deprecated, but still found in some really old gerber files. """ - code = 6 - # center x/y - x : UnitExpression - y : UnitExpression - d_outer : UnitExpression - line_thickness : UnitExpression - gap_w : UnitExpression - num_circles : Expression - crosshair_thickness : UnitExpression = 0 - crosshair_length : UnitExpression =0 - rotation : Expression = 0 - - def to_graphic_primitives(self, offset, rotation, variable_binding={}, unit=None, polarity_dark=True): - with self.Calculator(self, variable_binding, unit) as calc: - rotation += deg_to_rad(calc.rotation) - x, y = rotate_point(calc.x, calc.y, -rotation, 0, 0) - x, y = x+offset[0], y+offset[1] - - if math.isclose(calc.d_outer, 0): - return [] - - pitch = calc.line_thickness + calc.gap_w - for i in range(int(round(calc.num_circles))): - yield gp.Circle(x, y, calc.d_outer/2 - i*pitch, polarity_dark=True) - yield gp.Circle(x, y, calc.d_inner/2 - i*pitch - calc.line_thickness, polarity_dark=False) - - if math.isclose(calc.crosshair_thickness, 0, abs_tol=1e-6) or\ - math.isclose(calc.crosshair_length, 0, abs_tol=1e-6): - return - - yield gp.Rectangle(x, y, crosshair_length, crosshair_thickness, rotation=rotation, polarity_dark=True) - yield gp.Rectangle(x, y, crosshair_thickness, crosshair_length, rotation=rotation, polarity_dark=True) - - def dilate(self, offset, unit): - # I'd rather print a warning and produce graphically slightly incorrect output in these few cases here than - # producing macros that may evaluate to primitives with negative values. - warnings.warn('Attempted dilation of macro aperture thermal primitive. This is not supported.') - - def scale(self, scale): - return replace(self, - d_outer=self.d_outer * UnitExpression(scale), - d_inner=self.d_inner * UnitExpression(scale), - gap_w=self.gap_w * UnitExpression(scale), - x=self.x * UnitExpression(scale), - y=self.y * UnitExpression(scale)) - - @dataclass(frozen=True, slots=True) class Thermal(Primitive): code = 7 - # Note: Thermal primitives according to spec don't have an exposure variable # center x/y x : UnitExpression y : UnitExpression @@ -309,16 +214,13 @@ class Thermal(Primitive): x, y = rotate_point(calc.x, calc.y, -rotation, 0, 0) x, y = x+offset[0], y+offset[1] - dark = True - - if math.isclose(calc.d_outer, 0): - return [] + dark = (bool(calc.exposure) == polarity_dark) return [ gp.Circle(x, y, calc.d_outer/2, polarity_dark=dark), gp.Circle(x, y, calc.d_inner/2, polarity_dark=not dark), - gp.Rectangle(x, y, calc.d_outer, calc.gap_w, rotation=rotation, polarity_dark=not dark), - gp.Rectangle(x, y, calc.gap_w, calc.d_outer, rotation=rotation, polarity_dark=not dark), + gp.Rectangle(x, y, d_outer, gap_w, rotation=rotation, polarity_dark=not dark), + gp.Rectangle(x, y, gap_w, d_outer, rotation=rotation, polarity_dark=not dark), ] def dilate(self, offset, unit): @@ -338,7 +240,6 @@ class Thermal(Primitive): @dataclass(frozen=True, slots=True) class Outline(Primitive): code = 4 - exposure : Expression length: Expression coords: tuple rotation: Expression = 0 @@ -375,24 +276,21 @@ class Outline(Primitive): def __str__(self): return f'' - def to_gerber(self, register_variable=None, settings=None): + def to_gerber(self, unit=None): + # Calculate out rotation since at least gerbv mis-renders Outlines with rotation other than zero. rotation = self.rotation.optimized() - coords = ','.join(coord.optimized().to_gerber(register_variable, settings.unit) for coord in self.coords) - return f'{self.code},{self.exposure.optimized().to_gerber(register_variable)},{len(self.coords)//2-1},{coords},{rotation.to_gerber(register_variable)}' - - def substitute_params(self, binding, unit): - with self.Calculator(self, binding, unit) as calc: - rotation = calc.rotation - coords = [ rotate_point(x.calculate(binding, unit), y.calculate(binding, unit), -deg_to_rad(rotation), 0, 0) - for x, y in self.points ] + coords = self.coords + if isinstance(rotation, ConstantExpression): + rotation = math.radians(rotation.value) + # This will work even with variables in x and y, we just need to pass in cx and cy as UnitExpressions + unit_zero = UnitExpression(expr(0), MM) + coords = [ rotate_point(x, y, -rotation, cx=unit_zero, cy=unit_zero) for x, y in self.points ] coords = [ e for point in coords for e in point ] - return Outline(unit, calc.exposure, calc.length, coords) - def parameters(self): - yield from Primitive.parameters(self) + rotation = ConstantExpression(0) - for expr in self.coords: - yield from expr.parameters() + coords = ','.join(coord.to_gerber(unit) for coord in coords) + return f'{self.code},{self.exposure.to_gerber()},{len(self.coords)//2-1},{coords},{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: @@ -400,10 +298,6 @@ class Outline(Primitive): bound_coords = [ rotate_point(calc(x), calc(y), -rotation, 0, 0) for x, y in self.points ] bound_coords = [ (x+offset[0], y+offset[1]) for x, y in bound_coords ] bound_radii = [None] * len(bound_coords) - - if len(bound_coords) < 3: - return [] - return [gp.ArcPoly(bound_coords, bound_radii, polarity_dark=(bool(calc.exposure) == polarity_dark))] def dilated(self, offset, unit): @@ -419,7 +313,7 @@ class Comment: code = 0 comment: str - def to_gerber(self, register_variable=None, settings=None): + def to_gerber(self, unit=None): return f'0 {self.comment}' def dilated(self, offset, unit): @@ -437,7 +331,6 @@ PRIMITIVE_CLASSES = { CenterLine, Outline, Polygon, - Moire, Thermal, ]}, # alternative codes diff --git a/src/gerbonara/apertures.py b/gerbonara/apertures.py similarity index 90% rename from src/gerbonara/apertures.py rename to gerbonara/apertures.py index fae129e..094001d 100644 --- a/src/gerbonara/apertures.py +++ b/gerbonara/apertures.py @@ -16,11 +16,11 @@ # limitations under the License. # -import warnings import math from dataclasses import dataclass, replace, field, fields, InitVar, KW_ONLY from functools import lru_cache +from .aperture_macros.parse import GenericMacros from .utils import LengthUnit, MM, Inch, sum_bounds from . import graphic_primitives as gp @@ -159,8 +159,7 @@ class ExcellonTool(Aperture): return self def to_macro(self, rotation=0): - from .aperture_macros.parse import GenericMacros - return ApertureMacroInstance(GenericMacros.circle, self._params(unit=MM), unit=MM) + return ApertureMacroInstance(GenericMacros.circle, self._params(unit=MM)) def _params(self, unit=None): return (self.unit.convert_to(unit, self.diameter),) @@ -205,9 +204,7 @@ class CircleAperture(Aperture): hole_dia=None if self.hole_dia is None else self.hole_dia*scale) def to_macro(self, rotation=0): - from .aperture_macros.parse import GenericMacros - return GenericMacros.circle(MM(self.diameter, self.unit), - MM(self.hole_dia, self.unit)) + return ApertureMacroInstance(GenericMacros.circle, self._params(unit=MM)) def _params(self, unit=None): return _strip_right( @@ -262,11 +259,12 @@ class RectangleAperture(Aperture): hole_dia=None if self.hole_dia is None else self.hole_dia*scale) def to_macro(self, rotation=0): - from .aperture_macros.parse import GenericMacros - return GenericMacros.rect(MM(self.w, self.unit), - MM(self.h, self.unit), - MM(self.hole_dia, self.unit), - rotation) + return ApertureMacroInstance(GenericMacros.rect, + (MM(self.w, self.unit), + MM(self.h, self.unit), + MM(self.hole_dia, self.unit) or 0, + 0, + rotation)) def _params(self, unit=None): return _strip_right( @@ -330,11 +328,12 @@ class ObroundAperture(Aperture): rotation -= -math.pi/2 inst = replace(self, w=self.h, h=self.w, hole_dia=self.hole_dia) - from .aperture_macros.parse import GenericMacros - return GenericMacros.obround(MM(inst.w, self.unit), - MM(inst.h, self.unit), - MM(inst.hole_dia, self.unit) or 0, - rotation) + return ApertureMacroInstance(GenericMacros.obround, + (MM(inst.w, self.unit), + MM(inst.h, self.unit), + MM(inst.hole_dia, self.unit) or 0, + 0, + rotation)) def _params(self, unit=None): return _strip_right( @@ -390,18 +389,12 @@ class PolygonAperture(Aperture): hole_dia=None if self.hole_dia is None else self.hole_dia*scale) def to_macro(self): - from .aperture_macros.parse import GenericMacros - return GenericMacros.polygon(self.n_vertices, - MM(self.diameter, self.unit), - MM(self.hole_dia, self.unit), - self.rotation) + return ApertureMacroInstance(GenericMacros.polygon, self._params(MM)) def _params(self, unit=None): rotation = self.rotation % (2*math.pi / self.n_vertices) if math.isclose(rotation, 0, abs_tol=1e-6): rotation = None - else: - rotation = math.degrees(rotation) if self.hole_dia is not None: return self.unit.convert_to(unit, self.diameter), self.n_vertices, rotation, self.unit.convert_to(unit, self.hole_dia) @@ -452,17 +445,9 @@ class ApertureMacroInstance(Aperture): def scaled(self, scale): return replace(self, macro=self.macro.scaled(scale)) - def calculate_out(self, unit=None, macro_name=None): - return replace(self, - parameters=tuple(), - macro=self.macro.substitute_params(self._params(unit), unit, macro_name)) - def _params(self, unit=None): # We ignore "unit" here as we convert the actual macro, not this instantiation. # We do this because here we do not have information about which parameter has which physical units. - parameters = self.parameters - if len(parameters) > self.macro.num_parameters: - warnings.warn(f'Aperture definition using macro {self.macro.name} has more parameters than the macro uses.') - parameters = parameters[:self.macro.num_parameters] - return tuple(parameters) + return tuple(self.parameters) + diff --git a/src/gerbonara/cad/data/__init__.py b/gerbonara/cad/__init__.py similarity index 100% rename from src/gerbonara/cad/data/__init__.py rename to gerbonara/cad/__init__.py diff --git a/src/gerbonara/cad/breakout.py b/gerbonara/cad/breakout.py similarity index 100% rename from src/gerbonara/cad/breakout.py rename to gerbonara/cad/breakout.py diff --git a/src/gerbonara/cad/data/center-pad-spikes.kicad_mod b/gerbonara/cad/data/center-pad-spikes.kicad_mod similarity index 100% rename from src/gerbonara/cad/data/center-pad-spikes.kicad_mod rename to gerbonara/cad/data/center-pad-spikes.kicad_mod diff --git a/src/gerbonara/cad/data/pad-between-spiked.kicad_mod b/gerbonara/cad/data/pad-between-spiked.kicad_mod similarity index 100% rename from src/gerbonara/cad/data/pad-between-spiked.kicad_mod rename to gerbonara/cad/data/pad-between-spiked.kicad_mod diff --git a/src/gerbonara/cad/data/tht-0.8.kicad_mod b/gerbonara/cad/data/tht-0.8.kicad_mod similarity index 100% rename from src/gerbonara/cad/data/tht-0.8.kicad_mod rename to gerbonara/cad/data/tht-0.8.kicad_mod diff --git a/src/gerbonara/cad/protoserve_data/__init__.py b/gerbonara/cad/kicad/__init__.py similarity index 100% rename from src/gerbonara/cad/protoserve_data/__init__.py rename to gerbonara/cad/kicad/__init__.py diff --git a/src/gerbonara/cad/kicad/base_types.py b/gerbonara/cad/kicad/base_types.py similarity index 84% rename from src/gerbonara/cad/kicad/base_types.py rename to gerbonara/cad/kicad/base_types.py index 6a5d23e..32717fb 100644 --- a/src/gerbonara/cad/kicad/base_types.py +++ b/gerbonara/cad/kicad/base_types.py @@ -9,8 +9,7 @@ from itertools import cycle from .sexp import * from .sexp_mapper import * from ...newstroke import Newstroke -from ...utils import rotate_point, sum_bounds, Tag, MM -from ...layers import LayerStack +from ...utils import rotate_point, Tag, MM from ... import apertures as ap from ... import graphic_objects as go @@ -38,40 +37,11 @@ LAYER_MAP_K2G = { LAYER_MAP_G2K = {v: k for k, v in LAYER_MAP_K2G.items()} -class BBoxMixin: - def bounding_box(self, unit=MM): - if not hasattr(self, '_bounding_box'): - (min_x, min_y), (max_x, max_y) = sum_bounds(fe.bounding_box(unit) for fe in self.render()) - # Convert back from gerbonara's coordinates to kicad coordinates. - self._bounding_box = (min_x, -max_y), (max_x, -min_y) - - return self._bounding_box - - -@sexp_type('uuid') -class UUID: - value: str = field(default_factory=uuid.uuid4) - - def __deepcopy__(self, memo): - return UUID() - - def __after_parse__(self, parent): - self.value = str(self.value) - - def before_sexp(self): - self.value = str(self.value) - - def bump(self): - self.value = uuid.uuid4() - - @sexp_type('group') class Group: - locked: Flag() = False name: str = "" - id: Named(str) = None - uuid: UUID = field(default_factory=UUID) - members: Named(Array(str)) = field(default_factory=list) + id: Named(str) = "" + members: Named(List(str)) = field(default_factory=list) @sexp_type('color') @@ -124,23 +94,10 @@ class Stroke: return attrs -@sexp_type('fill') -class Fill: - type: Named(AtomChoice(Atom.none, Atom.outline, Atom.background, Atom.color)) = Atom.none - color: Color = None - - -class WidthMixin: - def __post_init__(self): - if self.width is not None: - self.stroke = Stroke(self.width) - - class Dasher: def __init__(self, obj): if obj.stroke: - w = obj.stroke.width if obj.stroke.width not in (None, 0, 0.0) else 0.254 - t = obj.stroke.type + w, t = obj.stroke.width or 0.254, obj.stroke.type else: w = obj.width or 0 t = Atom.solid @@ -253,20 +210,6 @@ class XYCoord: else: self.x, self.y = x, y - def __iter__(self): - return iter((self.x, self.y)) - - def __getitem__(self, index): - return (self.x, self.y)[index] - - def __setitem__(self, index, value): - if index == 0: - self.x = value - elif index == 1: - self.y = value - else: - raise IndexError(f'Invalid 2D point coordinate index {index}') - def within_distance(self, x, y, dist): return math.dist((x, y), (self.x, self.y)) < dist @@ -283,14 +226,7 @@ class XYCoord: @sexp_type('pts') class PointList: - @classmethod - def __map__(kls, obj, parent=None, path=''): - _tag, *values = obj - return [map_sexp(XYCoord, elem, parent=parent, path=path) for elem in values] - - @classmethod - def __sexp__(kls, value): - yield [kls.name_atom, *(e for elem in value for e in elem.__sexp__(elem))] + xy : List(XYCoord) = field(default_factory=list) @sexp_type('arc') @@ -303,38 +239,15 @@ class Arc: @sexp_type('pts') class ArcPointList: @classmethod - def __map__(kls, obj, parent=None, path=''): + def __map__(kls, obj, parent=None): _tag, *values = obj - return [map_sexp((XYCoord if elem[0] == 'xy' else Arc), elem, parent=parent, path=path) for elem in values] + return [map_sexp((XYCoord if elem[0] == 'xy' else Arc), elem, parent=parent) for elem in values] @classmethod def __sexp__(kls, value): yield [kls.name_atom, *(e for elem in value for e in elem.__sexp__(elem))] -@sexp_type('net') -class Net: - index: int = 0 - name: str = '' - - -class NetMixin: - def reset_net(self): - self.net = Net() - - @property - def net_index(self): - if self.net is None: - return 0 - return self.net.index - - @property - def net_name(self): - if self.net is None: - return '' - return self.net.name - - @sexp_type('xyz') class XYZCoord: x: float = 0 @@ -370,8 +283,8 @@ class FontSpec: face: Named(str) = None size: Rename(XYCoord) = field(default_factory=lambda: XYCoord(1.27, 1.27)) thickness: Named(float) = None - bold: OmitDefault(Named(LegacyCompatibleFlag())) = False - italic: OmitDefault(Named(LegacyCompatibleFlag())) = False + bold: Flag() = False + italic: Flag() = False line_spacing: Named(float) = None @@ -399,8 +312,8 @@ class Justify: @sexp_type('effects') class TextEffect: font: FontSpec = field(default_factory=FontSpec) + hide: Flag() = False justify: OmitDefault(Justify) = field(default_factory=Justify) - hide: OmitDefault(Named(LegacyCompatibleFlag())) = False class TextMixin: @@ -541,6 +454,23 @@ class Timestamp: self.value = uuid.uuid4() +@sexp_type('uuid') +class UUID: + value: str = field(default_factory=uuid.uuid4) + + def __deepcopy__(self, memo): + return UUID() + + def __after_parse__(self, parent): + self.value = str(self.value) + + def before_sexp(self): + self.value = Atom(str(self.value)) + + def bump(self): + self.value = uuid.uuid4() + + @sexp_type('tedit') class EditTime: value: str = field(default_factory=time.time) @@ -577,13 +507,11 @@ class DrawnProperty(TextMixin): key: str = None value: str = None id: Named(int) = None - at: AtPos = None - unlocked: OmitDefault(Named(YesNoAtom())) = True + at: AtPos = field(default_factory=AtPos) layer: Named(str) = None - hide: OmitDefault(Named(YesNoAtom())) = False - uuid: UUID = None + hide: Flag() = False tstamp: Timestamp = None - effects: OmitDefault(TextEffect) = field(default_factory=TextEffect) + effects: TextEffect = field(default_factory=TextEffect) _ : SEXP_END = None parent: object = None @@ -600,14 +528,6 @@ class DrawnProperty(TextMixin): self.value = value -@sexp_type('chamfer') -class Chamfer: - top_left: Flag() = False - top_right: Flag() = False - bottom_left: Flag() = False - bottom_right: Flag() = False - - if __name__ == '__main__': class Foo: pass diff --git a/src/gerbonara/cad/kicad/footprints.py b/gerbonara/cad/kicad/footprints.py similarity index 84% rename from src/gerbonara/cad/kicad/footprints.py rename to gerbonara/cad/kicad/footprints.py index bb0f0f7..b24e004 100644 --- a/src/gerbonara/cad/kicad/footprints.py +++ b/gerbonara/cad/kicad/footprints.py @@ -21,7 +21,6 @@ from . import graphical_primitives as gr from ..primitives import Positioned -from ... import __version__ from ... import graphic_primitives as gp from ... import graphic_objects as go from ... import apertures as ap @@ -55,9 +54,8 @@ class Text: type: AtomChoice(Atom.reference, Atom.value, Atom.user) = Atom.user text: str = "" at: AtPos = field(default_factory=AtPos) - unlocked: OmitDefault(Named(YesNoAtom())) = False + unlocked: Flag() = False layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) hide: Flag() = False effects: TextEffect = field(default_factory=TextEffect) tstamp: Timestamp = None @@ -74,15 +72,12 @@ class TextBox: locked: Flag() = False text: str = None start: Rename(XYCoord) = None - end: Rename(XYCoord) = None - margins: Rename(gr.Margins) = None + end: Named(XYCoord) = None pts: PointList = None angle: Named(float) = 0.0 layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None effects: TextEffect = field(default_factory=TextEffect) - border: Named(YesNoAtom()) = False stroke: Stroke = field(default_factory=Stroke) render_cache: RenderCache = None @@ -95,7 +90,6 @@ class Line: start: Rename(XYCoord) = None end: Rename(XYCoord) = None layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) width: Named(float) = None stroke: Stroke = None locked: Flag() = False @@ -119,10 +113,9 @@ class Rectangle: start: Rename(XYCoord) = None end: Rename(XYCoord) = None layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) width: Named(float) = None stroke: Stroke = None - fill: gr.FillMode = None + fill: Named(AtomChoice(Atom.solid, Atom.none)) = None locked: Flag() = False tstamp: Timestamp = None @@ -153,10 +146,9 @@ class Circle: center: Rename(XYCoord) = None end: Rename(XYCoord) = None layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) width: Named(float) = None stroke: Stroke = None - fill: gr.FillMode = None + fill: Named(AtomChoice(Atom.solid, Atom.none)) = None locked: Flag() = False tstamp: Timestamp = None @@ -190,10 +182,8 @@ class Arc: mid: Rename(XYCoord) = None end: Rename(XYCoord) = None width: Named(float) = None - angle: Named(float) = None stroke: Stroke = None layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) locked: Flag() = False tstamp: Timestamp = None @@ -230,7 +220,7 @@ class Arc: cy = ((x1 * x1 + y1 * y1) * (mx - x2) + (x2 * x2 + y2 * y2) * (x1 - mx) + (mx * mx + my * my) * (x2 - x1)) / d # KiCad only has clockwise arcs. - arc = go.Arc(x1, -y1, x2, -y2, cx-x1, -(cy-y1), clockwise=True, aperture=aperture, unit=MM) + arc = go.Arc(x1, -y1, x2, -y2, cx-x1, -(cy-y1), clockwise=False, aperture=aperture, unit=MM) if dasher.solid: yield arc @@ -245,39 +235,36 @@ class Arc: @sexp_type('fp_poly') class Polygon: - pts: PointList = field(default_factory=list) + pts: PointList = field(default_factory=PointList) layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) width: Named(float) = None stroke: Stroke = None - fill: gr.FillMode = None + fill: Named(AtomChoice(Atom.solid, Atom.none)) = None locked: Flag() = False tstamp: Timestamp = None def render(self, variables=None, cache=None): - if len(self.pts) < 2: + if len(self.pts.xy) < 2: return dasher = Dasher(self) - start = self.pts[0] - dasher.move(start.x, start.y) - for point in self.pts[1:]: + start = self.pts.xy[0] + dasher.move(start.x, -start.y) + for point in self.pts.xy[1:]: dasher.line(point.x, point.y) - if dasher.width > 0: - aperture = ap.CircleAperture(dasher.width, unit=MM) - for x1, y1, x2, y2 in dasher: - yield go.Line(x1, -y1, x2, -y2, aperture=aperture, unit=MM) + aperture = ap.CircleAperture(dasher.width, unit=MM) + for x1, y1, x2, y2 in dasher: + yield go.Line(x1, -y1, x2, -y2, aperture=aperture, unit=MM) if self.fill == Atom.solid: - yield go.Region([(pt.x, -pt.y) for pt in self.pts], unit=MM) + yield go.Region([(pt.x, -pt.y) for pt in self.pts.xy], unit=MM) @sexp_type('fp_curve') class Curve: - pts: PointList = field(default_factory=list) + pts: PointList = field(default_factory=PointList) layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) width: Named(float) = None stroke: Stroke = None locked: Flag() = False @@ -287,6 +274,46 @@ class Curve: raise NotImplementedError('Bezier rendering is not yet supported. Please raise an issue and provide an example file.') +@sexp_type('format') +class DimensionFormat: + prefix: Named(str) = None + suffix: Named(str) = None + units: Named(int) = 3 + units_format: Named(int) = 0 + precision: Named(int) = 3 + override_value: Named(str) = None + suppress_zeros: Flag() = False + + +@sexp_type('style') +class DimensionStyle: + thickness: Named(float) = None + arrow_length: Named(float) = None + text_position_mode: Named(int) = 0 + extension_height: Named(float) = None + text_frame: Named(int) = 0 + extension_offset: Named(str) = None + keep_text_aligned: Flag() = False + + +@sexp_type('dimension') +class Dimension: + locked: Flag() = False + type: AtomChoice(Atom.aligned, Atom.leader, Atom.center, Atom.orthogonal, Atom.radial) = None + layer: Named(str) = None + tstamp: Timestamp = None + pts: PointList = field(default_factory=PointList) + height: Named(float) = None + orientation: Named(int) = 0 + leader_length: Named(float) = None + gr_text: Named(Text) = None + format: DimensionFormat = field(default_factory=DimensionFormat) + style: DimensionStyle = field(default_factory=DimensionStyle) + + def render(self, variables=None, cache=None): + raise NotImplementedError() + + @sexp_type('drill') class Drill: oval: Flag() = False @@ -295,6 +322,12 @@ class Drill: offset: Rename(XYCoord) = None +@sexp_type('net') +class NetDef: + number: int = None + name: str = None + + @sexp_type('options') class CustomPadOptions: clearance: Named(AtomChoice(Atom.outline, Atom.convexhull)) = Atom.outline @@ -311,7 +344,7 @@ class CustomPadPrimitives: polygons: List(gr.Polygon) = field(default_factory=list) curves: List(gr.Curve) = field(default_factory=list) width: Named(float) = None - fill: gr.FillMode = True + fill: Named(YesNoAtom()) = True def all(self): yield from self.lines @@ -322,8 +355,16 @@ class CustomPadPrimitives: yield from self.curves +@sexp_type('chamfer') +class Chamfer: + top_left: Flag() = False + top_right: Flag() = False + bottom_left: Flag() = False + bottom_right: Flag() = False + + @sexp_type('pad') -class Pad(NetMixin): +class Pad: number: str = None type: AtomChoice(Atom.thru_hole, Atom.smd, Atom.connect, Atom.np_thru_hole) = None shape: AtomChoice(Atom.circle, Atom.rect, Atom.oval, Atom.trapezoid, Atom.roundrect, Atom.custom) = None @@ -333,22 +374,19 @@ class Pad(NetMixin): drill: Drill = None layers: Named(Array(str)) = field(default_factory=list) properties: List(Property) = field(default_factory=list) - remove_unused_layers: Named(YesNoAtom()) = False - keep_end_layers: Named(YesNoAtom()) = False - zone_layer_connections: Named(Array(str)) = field(default_factory=list) - uuid: UUID = field(default_factory=UUID) + remove_unused_layers: Wrap(Flag()) = False + keep_end_layers: Wrap(Flag()) = False rect_delta: Rename(XYCoord) = None roundrect_rratio: Named(float) = None thermal_bridge_angle: Named(int) = 45 thermal_bridge_width: Named(float) = 0.5 chamfer_ratio: Named(float) = None chamfer: Chamfer = None - net: Net = None + net: NetDef = None tstamp: Timestamp = None pin_function: Named(str) = None pintype: Named(str) = None pinfunction: Named(str) = None - teardrops: gr.TeardropSpec = None die_length: Named(float) = None solder_mask_margin: Named(float) = None solder_paste_margin: Named(float) = None @@ -358,10 +396,9 @@ class Pad(NetMixin): thermal_width: Named(float) = None thermal_gap: Named(float) = None options: OmitDefault(CustomPadOptions) = None - padstack: gr.PadStack = None primitives: OmitDefault(CustomPadPrimitives) = None _: SEXP_END = None - footprint: object = field(repr=False, default=None) + footprint: object = None def __after_parse__(self, parent=None): self.layers = unfuck_layers(self.layers) @@ -423,16 +460,16 @@ class Pad(NetMixin): elif self.shape == Atom.rect: if margin > 0: - return GenericMacros.rounded_rect(self.size.x+2*margin, - self.size.y+2*margin, - margin, - 0, # no hole - rotation) + return ap.ApertureMacroInstance(GenericMacros.rounded_rect, + (self.size.x+2*margin, self.size.y+2*margin, + margin, + 0, 0, # no hole + rotation), unit=MM) else: - return ap.RectangleAperture(self.size.x+2*margin, self.size.y+2*margin, unit=MM).rotated(-rotation) + return ap.RectangleAperture(self.size.x+2*margin, self.size.y+2*margin, unit=MM).rotated(rotation) elif self.shape == Atom.oval: - return ap.ObroundAperture(self.size.x+2*margin, self.size.y+2*margin, unit=MM).rotated(-rotation) + return ap.ObroundAperture(self.size.x+2*margin, self.size.y+2*margin, unit=MM).rotated(rotation) elif self.shape == Atom.trapezoid: # KiCad's trapezoid aperture "rect_delta" param is just weird to the point that I think it's probably @@ -454,31 +491,30 @@ class Pad(NetMixin): # Note: KiCad already uses MM units, so no conversion needed here. alpha = math.atan(y / dy) if dy > 0 else 0 - return GenericMacros.isosceles_trapezoid(x+dy+2*margin*math.cos(alpha), - y+2*margin, - 2*dy, - 0, # no hole - -rotation + math.pi) + return ap.ApertureMacroInstance(GenericMacros.isosceles_trapezoid, + (x+dy+2*margin*math.cos(alpha), y+2*margin, + 2*dy, + 0, 0, # no hole + rotation), unit=MM) else: - return GenericMacros.rounded_isosceles_trapezoid(x+dy, - y, - 2*dy, - margin, - 0, # no hole - -rotation + math.pi) + return ap.ApertureMacroInstance(GenericMacros.rounded_isosceles_trapezoid, + (x+dy, y, + 2*dy, margin, + 0, 0, # no hole + rotation), unit=MM) elif self.shape == Atom.roundrect: x, y = self.size.x, self.size.y r = min(x, y) * self.roundrect_rratio if margin > -r: - return GenericMacros.rounded_rect(x+2*margin, - y+2*margin, - r+margin, - 0, # no hole - rotation) + return ap.ApertureMacroInstance(GenericMacros.rounded_rect, + (x+2*margin, y+2*margin, + r+margin, + 0, 0, # no hole + rotation), unit=MM) else: - return ap.RectangleAperture(x+margin, y+margin, unit=MM).rotated(-rotation) + return ap.RectangleAperture(x+margin, y+margin, unit=MM).rotated(rotation) elif self.shape == Atom.custom: primitives = [] @@ -520,7 +556,7 @@ class Pad(NetMixin): elif self.options.anchor == Atom.circle and self.size.x > 0: primitives.append(amp.Circle(MM, 1, self.size.x+2*margin, 0, 0, 0)) - macro = ApertureMacro(primitives=tuple(primitives)).rotated(-rotation) + macro = ApertureMacro(primitives=tuple(primitives)).rotated(rotation) return ap.ApertureMacroInstance(macro, unit=MM) def render_drill(self): @@ -558,27 +594,18 @@ class Pad(NetMixin): @sexp_type('model') class Model: name: str = '' - hide: Flag() = False at: Named(XYZCoord) = field(default_factory=XYZCoord) offset: Named(XYZCoord) = field(default_factory=XYZCoord) - opacity: Named(float) = None scale: Named(XYZCoord) = field(default_factory=XYZCoord) rotate: Named(XYZCoord) = field(default_factory=XYZCoord) -@sexp_type('component_classes') -class FootprintComponentClasses: - classes: List(Named(str, name='class')) = field(default_factory=list) - - SUPPORTED_FILE_FORMAT_VERSIONS = [20210108, 20211014, 20221018, 20230517] @sexp_type('footprint') class Footprint: name: str = None _version: Named(int, name='version') = 20221018 - uuid: UUID = field(default_factory=UUID) - generator: Named(str) = Atom.gerbonara - generator_version: Named(str) = __version__ + generator: Named(Atom) = Atom.gerbonara locked: Flag() = False placed: Flag() = False layer: Named(str) = 'F.Cu' @@ -588,14 +615,12 @@ class Footprint: descr: Named(str) = None tags: Named(str) = None properties: List(DrawnProperty) = field(default_factory=list) - component_classes: FootprintComponentClasses = None path: Named(str) = None sheetname: Named(str) = None sheetfile: Named(str) = None autoplace_cost90: Named(float) = None autoplace_cost180: Named(float) = None solder_mask_margin: Named(float) = None - solder_paste_margin_ratio: Named(float) = None solder_paste_margin: Named(float) = None solder_paste_ratio: Named(float) = None clearance: Named(float) = None @@ -613,15 +638,15 @@ class Footprint: arcs: List(Arc) = field(default_factory=list) polygons: List(Polygon) = field(default_factory=list) curves: List(Curve) = field(default_factory=list) - dimensions: List(gr.Dimension) = field(default_factory=list) + dimensions: List(Dimension) = field(default_factory=list) pads: List(Pad) = field(default_factory=list) zones: List(Zone) = field(default_factory=list) groups: List(Group) = field(default_factory=list) - embedded_fonts: Named(YesNoAtom()) = False models: List(Model) = field(default_factory=list) _ : SEXP_END = None original_filename: str = None - board: object = field(repr=False, default=None) + _bounding_box: tuple = None + board: object = None def __after_parse__(self, parent): for pad in self.pads: @@ -668,10 +693,6 @@ class Footprint: if not self.property_value('Description', None): self.set_property('Description', self.descr or '', 0, 0, 0) - def reset_nets(self): - for pad in self.pads: - pad.reset_net() - @property def pads_by_number(self): return {(int(pad.number) if pad.number.isnumeric() else pad.number): pad for pad in self.pads if pad.number} @@ -698,14 +719,6 @@ class Footprint: def offset(self, x=0, y=0): self.at = self.at.with_offset(x, y) - def copy_placement(self, template): - # Fix up rotation of pads - KiCad saves each pad's rotation in *absolute* coordinates, not relative to the - # footprint. Because we overwrite the footprint's rotation below, we have to first fix all pads to match the - # new rotation. - self.rotate(math.radians(template.at.rotation - self.at.rotation)) - self.at = copy.copy(template.at) - self.side = template.side - @property def version(self): return self._version @@ -790,7 +803,7 @@ class Footprint: self.layer = flip_layer(self.layer) for obj in self.objects(): - if getattr(obj, 'layer', None) is not None: + if hasattr(obj, 'layer'): obj.layer = flip_layer(obj.layer) if hasattr(obj, 'layers'): @@ -800,9 +813,8 @@ class Footprint: obj.effects.justify.mirror = not obj.effects.justify.mirror for obj in self.properties: - if obj.layer is not None: - obj.effects.justify.mirror = not obj.effects.justify.mirror - obj.layer = flip_layer(obj.layer) + obj.effects.justify.mirror = not obj.effects.justify.mirror + obj.layer = flip_layer(obj.layer) @property def single_sided(self): @@ -841,20 +853,19 @@ class Footprint: around the given coordinates in the global coordinate space. Otherwise rotate around the footprint's origin. """ if (cx, cy) != (None, None): x, y = self.at.x-cx, self.at.y-cy - self.at.x = math.cos(-angle)*x - math.sin(-angle)*y + cx - self.at.y = math.sin(-angle)*x + math.cos(-angle)*y + cy + self.at.x = math.cos(angle)*x - math.sin(angle)*y + cx + self.at.y = math.sin(angle)*x + math.cos(angle)*y + cy - self.at.rotation = (self.at.rotation + math.degrees(angle)) % 360 + self.at.rotation = (self.at.rotation - math.degrees(angle)) % 360 for pad in self.pads: - pad.at.rotation = (pad.at.rotation + math.degrees(angle)) % 360 + pad.at.rotation = (pad.at.rotation - math.degrees(angle)) % 360 for prop in self.properties: - if prop.at is not None: - prop.at.rotation = (prop.at.rotation + math.degrees(angle)) % 360 + prop.at.rotation = (prop.at.rotation - math.degrees(angle)) % 360 for text in self.texts: - text.at.rotation = (text.at.rotation + math.degrees(angle)) % 360 + text.at.rotation = (text.at.rotation - math.degrees(angle)) % 360 def set_rotation(self, angle): old_deg = self.at.rotation @@ -865,13 +876,12 @@ class Footprint: pad.at.rotation = (pad.at.rotation + delta) % 360 for prop in self.properties: - if prop.at is not None: - prop.at.rotation = (prop.at.rotation + delta) % 360 + prop.at.rotation = (prop.at.rotation + delta) % 360 for text in self.texts: text.at.rotation = (text.at.rotation + delta) % 360 - def objects(self, text=False, pads=True, groups=True, zones=True): + def objects(self, text=False, pads=True, groups=True): return chain( (self.texts if text else []), (self.text_boxes if text else []), @@ -883,24 +893,21 @@ class Footprint: self.curves, (self.dimensions if text else []), (self.pads if pads else []), - (self.zones if zones else []), + self.zones, self.groups if groups else []) - def render(self, layer_stack, layer_map=None, x=0, y=0, rotation=0, text=False, flip=False, variables={}, cache=None): + def render(self, layer_stack, layer_map, x=0, y=0, rotation=0, text=False, flip=False, variables={}, cache=None): x += self.at.x y += self.at.y rotation += math.radians(self.at.rotation) - if layer_map is None: - layer_map = {kc_id: gn_id for kc_id, gn_id in LAYER_MAP_K2G.items() if gn_id in layer_stack} - - for obj in self.objects(pads=False, text=text, zones=False, groups=False): + for obj in self.objects(pads=False, text=text): if not (layer := layer_map.get(obj.layer)): continue for fe in obj.render(variables=variables): fe.rotate(rotation) - fe.offset(x, y, MM) + fe.offset(x, -y, MM) layer_stack[layer].objects.append(fe) for obj in self.pads: @@ -932,7 +939,7 @@ class Footprint: for fe in obj.render(margin=margin, cache=cache): fe.rotate(rotation) - fe.offset(x, y, MM) + fe.offset(x, -y, MM) if isinstance(fe, go.Flash) and fe.aperture: fe.aperture = fe.aperture.rotated(rotation) layer_stack[layer_map[layer]].objects.append(fe) @@ -940,7 +947,7 @@ class Footprint: for obj in self.pads: for fe in obj.render_drill(): fe.rotate(rotation) - fe.offset(x, y, MM) + fe.offset(x, -y, MM) if obj.type == Atom.np_thru_hole: layer_stack.drill_npth.append(fe) @@ -948,9 +955,10 @@ class Footprint: layer_stack.drill_pth.append(fe) def bounding_box(self, unit=MM): - if not hasattr(self, '_bounding_box'): + if not self._bounding_box: stack = LayerStack() - self.render(stack, layer_map=None, x=0, y=0, rotation=0, flip=False, text=False, variables={}) + layer_map = {kc_id: gn_id for kc_id, gn_id in LAYER_MAP_K2G.items() if gn_id in stack} + self.render(stack, layer_map, x=0, y=0, rotation=0, flip=False, text=False, variables={}) self._bounding_box = stack.bounding_box(unit) return self._bounding_box @@ -975,7 +983,9 @@ class FootprintInstance(Positioned): if self.value is not None: variables['VALUE'] = str(self.value) - self.sexp.render(layer_stack, layer_map=None, + layer_map = {kc_id: gn_id for kc_id, gn_id in LAYER_MAP_K2G.items() if gn_id in layer_stack} + + self.sexp.render(layer_stack, layer_map, x=x, y=y, rotation=rotation, flip=flip, text=(not self.hide_text), diff --git a/src/gerbonara/cad/kicad/graphical_primitives.py b/gerbonara/cad/kicad/graphical_primitives.py similarity index 58% rename from src/gerbonara/cad/kicad/graphical_primitives.py rename to gerbonara/cad/kicad/graphical_primitives.py index bcbd126..a2393d2 100644 --- a/src/gerbonara/cad/kicad/graphical_primitives.py +++ b/gerbonara/cad/kicad/graphical_primitives.py @@ -1,8 +1,6 @@ import string import math -import base64 -import textwrap from .sexp import * from .base_types import * @@ -11,7 +9,7 @@ from .primitives import * from ... import graphic_objects as go from ... import apertures as ap from ...newstroke import Newstroke -from ...utils import rotate_point, MM, arc_bounds +from ...utils import rotate_point, MM @sexp_type('layer') class TextLayer: @@ -20,12 +18,10 @@ class TextLayer: @sexp_type('gr_text') -class Text(TextMixin, BBoxMixin): - locked: Flag() = False +class Text(TextMixin): text: str = '' at: AtPos = field(default_factory=AtPos) layer: TextLayer = field(default_factory=TextLayer) - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None effects: TextEffect = field(default_factory=TextEffect) render_cache: RenderCache = None @@ -35,19 +31,16 @@ class Text(TextMixin, BBoxMixin): @sexp_type('gr_text_box') -class TextBox(BBoxMixin): +class TextBox: locked: Flag() = False text: str = '' start: Named(XYCoord) = None end: Named(XYCoord) = None - margins: Margins = None - pts: PointList = field(default_factory=list) + pts: PointList = field(default_factory=PointList) angle: OmitDefault(Named(float)) = 0.0 layer: Named(str) = "" - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None effects: TextEffect = field(default_factory=TextEffect) - border: Named(YesNoAtom()) = False stroke: Stroke = field(default_factory=Stroke) render_cache: RenderCache = None @@ -60,7 +53,7 @@ class TextBox(BBoxMixin): raise ValueError('Vector font text with empty render cache') for poly in render_cache.polygons: - reg = go.Region([(p.x, -p.y) for p in poly.pts], unit=MM) + reg = go.Region([(p.x, -p.y) for p in poly.pts.xy], unit=MM) if self.stroke: if self.stroke.type not in (None, Atom.default, Atom.solid): @@ -76,15 +69,13 @@ class TextBox(BBoxMixin): @sexp_type('gr_line') -class Line(WidthMixin): - locked: Flag() = False +class Line: start: Rename(XYCoord) = None end: Rename(XYCoord) = None angle: Named(float) = None # wat layer: Named(str) = None width: Named(float) = None stroke: Stroke = field(default_factory=Stroke) - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None def rotate(self, angle, cx=None, cy=None): @@ -107,26 +98,6 @@ class Line(WidthMixin): self.start = self.start.with_offset(x, y) self.end = self.end.with_offset(x, y) - def bounding_box(self, unit=MM): - x_min, x_max = min(self.start.x, self.end.x), max(self.start.x, self.end.x) - y_min, y_max = min(self.start.y, self.end.y), max(self.start.y, self.end.y) - w = self.stroke.width if self.stroke else self.width - return (x_min-w, y_max-w), (x_max+w, y_max+w) - - -@sexp_type('target') -class Target(WidthMixin): - shape: AtomChoice(Atom.x, Atom.plus) = 'plus' - at: AtPos = field(default_factory=AtPos) - size: Rename(XYCoord) = field(default_factory=XYCoord) - width: Named(float) = None - layer: Named(str) = None - uuid: UUID = field(default_factory=UUID) - tstamp: Timestamp = None - - def render(self, variables=None): - raise NotImplementedError('Target objects are not implemented yet') - @sexp_type('fill') class FillMode: @@ -134,7 +105,7 @@ class FillMode: fill: AtomChoice(Atom.solid, Atom.yes, Atom.no, Atom.none) = False @classmethod - def __map__(kls, obj, parent=None, path=''): + def __map__(kls, obj, parent=None): return obj[1] in (Atom.solid, Atom.yes) @classmethod @@ -142,15 +113,13 @@ class FillMode: yield [Atom.fill, Atom.solid if value else Atom.none] @sexp_type('gr_rect') -class Rectangle(BBoxMixin, WidthMixin): - locked: Flag() = False +class Rectangle: start: Rename(XYCoord) = None end: Rename(XYCoord) = None layer: Named(str) = None width: Named(float) = None stroke: Stroke = field(default_factory=Stroke) fill: FillMode = False - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None def render(self, variables=None): @@ -161,9 +130,9 @@ class Rectangle(BBoxMixin, WidthMixin): if self.fill: yield rect - if (w := self.stroke.width if self.stroke else self.width): + if self.width: # FIXME stroke support - yield from rect.outline_objects(aperture=ap.CircleAperture(w, unit=MM)) + yield from rect.outline_objects(aperture=ap.CircleAperture(self.width, unit=MM)) @property def top_left(self): @@ -176,24 +145,21 @@ class Rectangle(BBoxMixin, WidthMixin): @sexp_type('gr_circle') -class Circle(BBoxMixin, WidthMixin): - locked: Flag() = False +class Circle: center: Rename(XYCoord) = None end: Rename(XYCoord) = None layer: Named(str) = None width: Named(float) = None stroke: Stroke = field(default_factory=Stroke) fill: FillMode = False - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None def render(self, variables=None): r = math.dist((self.center.x, -self.center.y), (self.end.x, -self.end.y)) - w = self.stroke.width if self.stroke else self.width - aperture = ap.CircleAperture(w or 0, unit=MM) + aperture = ap.CircleAperture(self.width or 0, unit=MM) arc = go.Arc.from_circle(self.center.x, -self.center.y, r, aperture=aperture, unit=MM) - if w: + if self.width: # FIXME stroke support yield arc @@ -204,22 +170,15 @@ class Circle(BBoxMixin, WidthMixin): self.center = self.center.with_offset(x, y) self.end = self.end.with_offset(x, y) - def rotate(self, angle, cx=0, cy=0): - self.center = self.center.with_rotation(angle, cx, cy) - self.end = self.end.with_rotation(angle, cx, cy) - @sexp_type('gr_arc') -class Arc(WidthMixin, BBoxMixin): - locked: Flag() = False +class Arc: start: Rename(XYCoord) = None mid: Rename(XYCoord) = None end: Rename(XYCoord) = None - angle: Named(float) = None layer: Named(str) = None width: Named(float) = None stroke: Stroke = field(default_factory=Stroke) - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None _: SEXP_END = None center: XYCoord = None @@ -233,94 +192,69 @@ class Arc(WidthMixin, BBoxMixin): self.mid = center_arc_to_kicad_mid(XYCoord(self.center), self.start, self.end) self.center = None + def rotate(self, angle, cx=None, cy=None): + self.start.x, self.start.y = rotate_point(self.start.x, self.start.y, angle, cx, cy) + self.mid.x, self.mid.y = rotate_point(self.mid.x, self.mid.y, angle, cx, cy) + self.end.x, self.end.y = rotate_point(self.end.x, self.end.y, angle, cx, cy) + def render(self, variables=None): - if not (w := self.stroke.width if self.stroke else self.width): + # FIXME stroke support + if not self.width: return - aperture = ap.CircleAperture(w, unit=MM) + aperture = ap.CircleAperture(self.width, unit=MM) + cx, cy = self.mid.x, self.mid.y x1, y1 = self.start.x, self.start.y x2, y2 = self.end.x, self.end.y - (cx, cy), _r, clockwise = kicad_mid_to_center_arc(self.mid, self.start, self.end) - yield go.Arc(x1, -y1, x2, -y2, cx-x1, -(cy-y1), aperture=aperture, clockwise=not clockwise, unit=MM) + yield go.Arc(x1, -y1, x2, -y2, cx-x1, -(cy-y1), aperture=aperture, clockwise=True, unit=MM) def offset(self, x=0, y=0): self.start = self.start.with_offset(x, y) self.mid = self.mid.with_offset(x, y) self.end = self.end.with_offset(x, y) - def rotate(self, angle, cx=None, cy=None): - self.start.x, self.start.y = rotate_point(self.start.x, self.start.y, angle, cx, cy) - self.mid.x, self.mid.y = rotate_point(self.mid.x, self.mid.y, angle, cx, cy) - self.end.x, self.end.y = rotate_point(self.end.x, self.end.y, angle, cx, cy) - @sexp_type('gr_poly') -class Polygon(BBoxMixin, WidthMixin): +class Polygon: pts: ArcPointList = field(default_factory=list) layer: Named(str) = None width: Named(float) = None stroke: Stroke = field(default_factory=Stroke) fill: FillMode = True - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None def render(self, variables=None): - points = [] - centers = [] - for point_or_arc in self.pts: - if points: - centers.append((None, (None, None))) - - if isinstance(point_or_arc, XYCoord): - points.append((point_or_arc.x, -point_or_arc.y)) - - else: # base_types.Arc - points.append((point_or_arc.start.x, -point_or_arc.start.y)) - points.append((point_or_arc.end.x, -point_or_arc.end.y)) - (cx, cy), _r, clockwise = kicad_mid_to_center_arc(point_or_arc.mid, point_or_arc.start, point_or_arc.end) - centers.append((not clockwise, (cx, -cy))) - - reg = go.Region(points, centers, unit=MM) - reg.close() + reg = go.Region([(pt.x, -pt.y) for pt in self.pts.xy], unit=MM) - w = self.stroke.width if self.stroke else self.width # FIXME stroke support - if w and w >= 0.005: - yield from reg.outline_objects(aperture=ap.CircleAperture(w, unit=MM)) + if self.width and self.width >= 0.005 or self.stroke.width and self.stroke.width > 0.005: + yield from reg.outline_objects(aperture=ap.CircleAperture(self.width, unit=MM)) if self.fill: yield reg def offset(self, x=0, y=0): - self.pts = [pt.with_offset(x, y) for pt in self.pts] - - def rotate(self, angle, cx=0, cy=0): - self.pts = [pt.with_rotation(angle, cx, cy) for pt in self.pts] + self.pts = PointList([pt.with_offset(x, y) for pt in self.pts]) @sexp_type('gr_curve') -class Curve(BBoxMixin, WidthMixin): - locked: Flag() = False - pts: PointList = field(default_factory=list) +class Curve: + pts: PointList = field(default_factory=PointList) layer: Named(str) = None width: Named(float) = None - stroke: Stroke = field(default_factory=Stroke) - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = None def render(self, variables=None): raise NotImplementedError('Bezier rendering is not yet supported. Please raise an issue and provide an example file.') def offset(self, x=0, y=0): - self.pts =[pt.with_offset(x, y) for pt in self.pts] + self.pts = PointList([pt.with_offset(x, y) for pt in self.pts]) @sexp_type('gr_bbox') class AnnotationBBox: start: Rename(XYCoord) = None end: Rename(XYCoord) = None - width: Named(float) = None - fill: FillMode = False def render(self, variables=None): return [] @@ -339,7 +273,6 @@ class DimensionFormat: precision: Named(int) = 7 override_value: Named(str) = None suppress_zeros: Flag() = False - suppress_zeroes: Flag() = False @sexp_type('style') @@ -347,36 +280,19 @@ class DimensionStyle: thickness: Named(float) = 0.1 arrow_length: Named(float) = 1.27 text_position_mode: Named(int) = 0 - arrow_direction: Named(AtomChoice(Atom.inward, Atom.outward)) = None extension_height: Named(float) = None text_frame: Named(float) = None extension_offset: Named(float) = None keep_text_aligned: Flag() = False -@sexp_type('data') -class Base64Blob: - @classmethod - def __map__(kls, obj, parent=None, path=''): - _data, *content = obj - for x in content[:10]: - print(str(x)) - return base64.b64decode(''.join(map(str, content))) - - @classmethod - def __sexp__(kls, value): - encoded = base64.b64encode(value).decode() - yield [Atom.data, *textwrap.wrap(encoded, 76)] - - @sexp_type('image') class Image: at: AtPos = field(default_factory=AtPos) scale: Named(float) = None layer: Named(str) = None - locked: Flag() = False uuid: UUID = field(default_factory=UUID) - data: Base64Blob = '' + data: str = '' def offset(self, x=0, y=0): self.at = self.at.with_offset(x, y) @@ -384,15 +300,12 @@ class Image: @sexp_type('dimension') class Dimension: - value: float = None locked: Flag() = False dimension_type: Named(AtomChoice(Atom.aligned, Atom.leader, Atom.center, Atom.orthogonal, Atom.radial), name='type') = Atom.aligned layer: Named(str) = 'Dwgs.User' - uuid: UUID = field(default_factory=UUID) tstamp: Timestamp = field(default_factory=Timestamp) - pts: PointList = field(default_factory=list) + pts: PointList = field(default_factory=PointList) height: Named(float) = None - width: Named(float) = None orientation: Named(int) = None leader_length: Named(float) = None gr_text: Text = None @@ -403,60 +316,5 @@ class Dimension: raise NotImplementedError('Dimension rendering is not yet supported. Please raise an issue.') def offset(self, x=0, y=0): - self.pts = [pt.with_offset(x, y) for pt in self.pts] - - -@sexp_type('options') -class PadStackLayerOptions: - anchor: AtomChoice(Atom.rect, Atom.circle) = Atom.circle - - -@sexp_type('primitives') -class PadStackPrimitives: - vectors: Rename(Line, name='gr_vector') = field(default_factory=list) - lines: List(Line) = field(default_factory=list) - bboxes: List(AnnotationBBox) = field(default_factory=list) - arcs: List(Arc) = field(default_factory=list) - circles: List(Circle) = field(default_factory=list) - curves: List(Curve) = field(default_factory=list) - polygons:List(Polygon) = field(default_factory=list) - - -@sexp_type('layer') -class PadStackLayer: - layer: str = '' - shape: Named(AtomChoice(Atom.circle, Atom.rect, Atom.oval, Atom.trapezoid, Atom.roundrect, Atom.custom)) = Atom.circle - size: Rename(XYCoord) = field(default_factory=XYCoord) - rect_delta: Rename(XYCoord) = None - offset: Rename(XYCoord) = None - roundrect_rratio: Named(float) = None - chamfer_ratio: Named(float) = None - chamfer: Chamfer = None - primitives: PadStackPrimitives = None - options: PadStackLayerOptions = None - thermal_bridge_angle: Named(float) = None - thermal_gap: Named(float) = None - thermal_bridge_width: Named(float) = None - clearance: Named(float) = None - zone_connect: Named(int) = None - - -@sexp_type('padstack') -class PadStack: - mode: Named(AtomChoice('front_inner_back', 'custom')) = Atom.front_inner_back - layers: List(PadStackLayer) = field(default_factory=list) - - -@sexp_type('teardrops') -class TeardropSpec: - best_length_ratio: Named(float) = 1.0 - max_length: Named(float) = 2.0 - best_width_ratio: Named(float) = 1.0 - max_width: Named(float) = 2.0 - curve_points: Named(int) = 0 - filter_ratio: Named(float) = 0.9 - enabled: Named(YesNoAtom()) = True - allow_two_segments: Named(YesNoAtom()) = True - prefer_zone_connections: Named(YesNoAtom()) = True - + self.pts = PointList([pt.with_offset(x, y) for pt in self.pts]) diff --git a/src/gerbonara/cad/kicad/layer_colors.py b/gerbonara/cad/kicad/layer_colors.py similarity index 100% rename from src/gerbonara/cad/kicad/layer_colors.py rename to gerbonara/cad/kicad/layer_colors.py diff --git a/src/gerbonara/cad/kicad/pcb.py b/gerbonara/cad/kicad/pcb.py similarity index 85% rename from src/gerbonara/cad/kicad/pcb.py rename to gerbonara/cad/kicad/pcb.py index 6ad05f2..c5b2bd3 100644 --- a/src/gerbonara/cad/kicad/pcb.py +++ b/gerbonara/cad/kicad/pcb.py @@ -59,22 +59,13 @@ def gn_layer_to_kicad(layer, flip=False): @sexp_type('general') class GeneralSection: thickness: Named(float) = 1.60 - legacy_teardrops: Named(YesNoAtom()) = False - drawings: Named(int) = None - tracks: Named(int) = None - zones: Named(int) = None - modules: Named(int) = None - nets: Named(int) = None - links: Named(int) = None - no_connects: Named(int) = None - area: Named(Array(float)) = None @sexp_type('layers') class LayerSettings: index: int = 0 canonical_name: str = None - layer_type: AtomChoice(Atom.jumper, Atom.mixed, Atom.power, Atom.signal, Atom.user, Atom.auxiliary) = Atom.signal + layer_type: AtomChoice(Atom.jumper, Atom.mixed, Atom.power, Atom.signal, Atom.user) = Atom.signal custom_name: str = None @@ -100,29 +91,76 @@ class StackupSettings: castellated_pads: Named(YesNoAtom()) = None edge_plating: Named(YesNoAtom()) = None + +TFBool = YesNoAtom(yes=Atom.true, no=Atom.false) + +@sexp_type('pcbplotparams') +class ExportSettings: + layerselection: Named(Atom) = None + plot_on_all_layers_selection: Named(Atom) = None + disableapertmacros: Named(TFBool) = False + usegerberextensions: Named(TFBool) = True + usegerberattributes: Named(TFBool) = True + usegerberadvancedattributes: Named(TFBool) = True + creategerberjobfile: Named(TFBool) = True + dashed_line_dash_ratio: Named(float) = 12.0 + dashed_line_gap_ratio: Named(float) = 3.0 + svguseinch: Named(TFBool) = False + svgprecision: Named(float) = 4 + excludeedgelayer: Named(TFBool) = False + plotframeref: Named(TFBool) = False + viasonmask: Named(TFBool) = False + mode: Named(int) = 1 + useauxorigin: Named(TFBool) = False + hpglpennumber: Named(int) = 1 + hpglpenspeed: Named(int) = 20 + hpglpendiameter: Named(float) = 15.0 + pdf_front_fp_property_popups: Named(TFBool) = True + pdf_back_fp_property_popups: Named(TFBool) = True + dxfpolygonmode: Named(TFBool) = True + dxfimperialunits: Named(TFBool) = False + dxfusepcbnewfont: Named(TFBool) = True + psnegative: Named(TFBool) = False + psa4output: Named(TFBool) = False + plotreference: Named(TFBool) = True + plotvalue: Named(TFBool) = True + plotinvisibletext: Named(TFBool) = False + sketchpadsonfab: Named(TFBool) = False + subtractmaskfromsilk: Named(TFBool) = False + outputformat: Named(int) = 1 + mirror: Named(TFBool) = False + drillshape: Named(int) = 0 + scaleselection: Named(int) = 1 + outputdirectory: Named(str) = "gerber" + + @sexp_type('setup') class BoardSetup: - @classmethod - def __map__(kls, obj, parent=None, path=''): - return obj + stackup: OmitDefault(StackupSettings) = field(default_factory=StackupSettings) + pad_to_mask_clearance: Named(float) = None + solder_mask_min_width: Named(float) = None + pad_to_past_clearance: Named(float) = None + pad_to_paste_clearance_ratio: Named(float) = None + aux_axis_origin: Rename(XYCoord) = None + grid_origin: Rename(XYCoord) = None + export_settings: ExportSettings = field(default_factory=ExportSettings) - @classmethod - def __sexp__(kls, value): - yield value + +@sexp_type('net') +class Net: + index: int = 0 + name: str = '' @sexp_type('segment') -class TrackSegment(BBoxMixin): +class TrackSegment: start: Rename(XYCoord) = field(default_factory=XYCoord) end: Rename(XYCoord) = field(default_factory=XYCoord) width: Named(float) = 0.5 - locked: Flag() = False layer: Named(str) = 'F.Cu' - extra_layers: Named(Array(str), name='layers') = field(default_factory=list) - solder_mask_margin: Named(float) = None + locked: Flag() = False net: Named(int) = 0 - uuid: UUID = field(default_factory=UUID) - tstamp: Timestamp = None + tstamp: Timestamp = field(default_factory=Timestamp) @classmethod def from_footprint_line(kls, line, flip=False): @@ -133,15 +171,6 @@ class TrackSegment(BBoxMixin): self.start = XYCoord(self.start) self.end = XYCoord(self.end) - def __after_parse__(self, parent): - if self.extra_layers: - self.layer, *self.extra_layers = self.extra_layers - - def __before_sexp__(self): - if self.extra_layers: - self.extra_layers.insert(0, self.layer) - self.layer = None - @property def layer_mask(self): return layer_mask([self.layer]) @@ -166,7 +195,7 @@ class TrackSegment(BBoxMixin): @sexp_type('arc') -class TrackArc(BBoxMixin): +class TrackArc: start: Rename(XYCoord) = field(default_factory=XYCoord) mid: Rename(XYCoord) = field(default_factory=XYCoord) end: Rename(XYCoord) = field(default_factory=XYCoord) @@ -174,15 +203,14 @@ class TrackArc(BBoxMixin): layer: Named(str) = 'F.Cu' locked: Flag() = False net: Named(int) = 0 - uuid: UUID = field(default_factory=UUID) - tstamp: Timestamp = None + tstamp: Timestamp = field(default_factory=Timestamp) _: SEXP_END = None center: XYCoord = None def __post_init__(self): self.start = XYCoord(self.start) self.end = XYCoord(self.end) - self.mid = XYCoord(self.mid) if self.center is None else center_arc_to_kicad_mid(XYCoord(self.center), self.start, self.end) + self.mid = XYCoord(self.mid) if self.mid else center_arc_to_kicad_mid(XYCoord(self.center), self.start, self.end) self.center = None @property @@ -210,31 +238,19 @@ class TrackArc(BBoxMixin): self.end = self.end.with_offset(x, y) -@sexp_type('tenting') -class Tenting: - front: Flag() = False - back: Flag() = False - none: Flag() = False - - @sexp_type('via') -class Via(BBoxMixin): +class Via: via_type: AtomChoice(Atom.blind, Atom.micro) = None locked: Flag() = False at: Rename(XYCoord) = field(default_factory=XYCoord) size: Named(float) = 0.8 drill: Named(float) = 0.4 layers: Named(Array(str)) = field(default_factory=lambda: ['F.Cu', 'B.Cu']) - teardrops: gr.TeardropSpec = None - tenting: Tenting = None - padstack: gr.PadStack = None remove_unused_layers: Flag() = False keep_end_layers: Flag() = False - free: Named(YesNoAtom()) = False - zone_layer_connections: Named(Array(str)) = field(default_factory=list) + free: Wrap(Flag()) = False net: Named(int) = 0 - uuid: UUID = field(default_factory=UUID) - tstamp: Timestamp = None + tstamp: Timestamp = field(default_factory=Timestamp) @classmethod def from_pad(kls, pad): @@ -287,70 +303,22 @@ class Via(BBoxMixin): self.at = self.at.with_offset(x, y) -@sexp_type('net_class') -class LegacyNetclass: - name: str = '' - description: str = '' - clearance: Named(float) = None - trace_width: Named(float) = None - via_dia: Named(float) = None - via_drill: Named(float) = None - uvia_dia: Named(float) = None - uvia_drill: Named(float) = None - diff_pair_width: Named(float) = None - diff_pair_gap: Named(float) = None - nets: Rename(List(Named(str)), name='add_net') = field(default_factory=list) - - -@sexp_type('generated') -class GeneratedPatterns: - type: Named(Atom) = '' - name: Named(str) = '' - layer: Named(str) = '' - locked: Flag() = False - members: Named(Array(Atom), name='members') = field(default_factory=list) - _ : SEXP_END = None - params: dict = field(default_factory=dict) - - def __catchall__(self, sexp_value, path=''): - key, value = sexp_value - self.params[key] = value - - @classmethod - def __sexp__(kls, value): - return [kls.name_atom, - ['type', value.type], - ['name', value.name], - ['layer', value.layer], - ['locked', ('true' if value.locked else 'false')], - *[[k, v] for k, v in value.params.items()], - ['members', *value.members]] - - - -SUPPORTED_FILE_FORMAT_VERSIONS = [20200119, 20200512, 20210108, 20211014, 20220621, 20221018, 20230517, 20240706, 20240922, 20241229] +SUPPORTED_FILE_FORMAT_VERSIONS = [20210108, 20211014, 20221018, 20230517] @sexp_type('kicad_pcb') class Board: _version: Named(int, name='version') = 20230517 - generator: Named(str) = Atom.gerbonara - generator_version: Named(str) = Atom.gerbonara - legacy_generator: Named(Array(str), name='host') = None + generator: Named(Atom) = Atom.gerbonara general: GeneralSection = None - paper: PageSettings = None - legacy_page: Rename(PageSettings, 'page') = None - title_block: TitleBlock = None + page: PageSettings = None layers: Named(Array(Untagged(LayerSettings))) = field(default_factory=list) setup: BoardSetup = field(default_factory=BoardSetup) properties: List(Property) = field(default_factory=list) nets: List(Net) = field(default_factory=list) - legacy_netclasses: List(LegacyNetclass) = field(default_factory=list) footprints: List(Footprint) = field(default_factory=list) - legacy_footprints: Rename(List(Footprint), 'module') = field(default_factory=list) # Graphical elements texts: List(gr.Text) = field(default_factory=list) text_boxes: List(gr.TextBox) = field(default_factory=list) lines: List(gr.Line) = field(default_factory=list) - targets: List(gr.Target) = field(default_factory=list) rectangles: List(gr.Rectangle) = field(default_factory=list) circles: List(gr.Circle) = field(default_factory=list) arcs: List(gr.Arc) = field(default_factory=list) @@ -365,11 +333,10 @@ class Board: # Other stuff zones: List(Zone) = field(default_factory=list) groups: List(Group) = field(default_factory=list) - generated_patterns: List(GeneratedPatterns) = field(default_factory=list) - embedded_fonts: Named(YesNoAtom()) = False _ : SEXP_END = None original_filename: str = None + _bounding_box: tuple = None _trace_index: rtree.index.Index = None _trace_index_map: dict = None @@ -408,15 +375,15 @@ class Board: (47, 'F.CrtYd', 'user', 'F.Courtyard'), (48, 'B.Fab', 'user', None), (49, 'F.Fab', 'user', None), - (50, 'User.1', 'auxiliary', None), - (51, 'User.2', 'auxiliary', None), - (52, 'User.3', 'auxiliary', None), - (53, 'User.4', 'auxiliary', None), - (54, 'User.5', 'auxiliary', None), - (55, 'User.6', 'auxiliary', None), - (56, 'User.7', 'auxiliary', None), - (57, 'User.8', 'auxiliary', None), - (58, 'User.9', 'auxiliary', None)]] + (50, 'User.1', 'user', None), + (51, 'User.2', 'user', None), + (52, 'User.3', 'user', None), + (53, 'User.4', 'user', None), + (54, 'User.5', 'user', None), + (55, 'User.6', 'user', None), + (56, 'User.7', 'user', None), + (57, 'User.8', 'user', None), + (58, 'User.9', 'user', None)]] def rebuild_trace_index(self): @@ -532,8 +499,6 @@ class Board: fp.board = self self.nets = {net.index: net.name for net in self.nets} - if self.legacy_page: - self.paper, self.legacy_page = self.legacy_page, None def __before_sexp__(self): @@ -695,11 +660,11 @@ class Board: for fp in self.footprints: if name and not match_filter(name, fp.name): continue - if value and not match_filter(value, fp.value): + if value and not match_filter(value, fp.properties.get('value', '')): continue - if reference and not match_filter(reference, fp.reference): + if reference and not match_filter(reference, fp.properties.get('reference', '')): continue - if net and not any(pad.net and match_filter(net, pad.net.name) for pad in fp.pads): + if net and not any(match_filter(net, pad.net.name) for pad in fp.pads): continue if sheetname and not match_filter(sheetname, fp.sheetname): continue @@ -815,6 +780,15 @@ class Board: fe.offset(x, -y, MM) layer_stack.drill_pth.append(fe) + def bounding_box(self, unit=MM): + if not self._bounding_box: + stack = LayerStack() + layer_map = {kc_id: gn_id for kc_id, gn_id in LAYER_MAP_K2G.items() if gn_id in stack} + self.render(stack, layer_map, x=0, y=0, rotation=0, flip=False, text=False, variables={}) + self._bounding_box = stack.bounding_box(unit) + return self._bounding_box + + @dataclass class BoardInstance(cad_pr.Positioned): sexp: Board = None diff --git a/src/gerbonara/cad/kicad/primitives.py b/gerbonara/cad/kicad/primitives.py similarity index 59% rename from src/gerbonara/cad/kicad/primitives.py rename to gerbonara/cad/kicad/primitives.py index cc395bf..74ce4e4 100644 --- a/src/gerbonara/cad/kicad/primitives.py +++ b/gerbonara/cad/kicad/primitives.py @@ -38,7 +38,7 @@ def layer_mask(layers): case 'B.Cu': mask |= 1<<31 case _: - if (m := re.match(fr'In([0-9]+)\.Cu', layer)): + if (m := re.match(f'In([0-9]+)\.Cu', layer)): mask |= 1< len(lines): - lines.append('') - lines[lineno-1] = content - - @classmethod - def __sexp__(kls, value): - l = [Atom.comment] - for i, line in enumerate(value.splitlines(), start=1): - l.append(i) - l.append(line.rstrip('\n')) - return l - - -@sexp_type('title_block') -class TitleBlock: - title: Named(str) = '' - date: Named(str) = '' - rev: Named(str) = '' - company: Named(str) = '' - comment: TitleComment = None - diff --git a/src/gerbonara/cad/kicad/schematic.py b/gerbonara/cad/kicad/schematic.py similarity index 87% rename from src/gerbonara/cad/kicad/schematic.py rename to gerbonara/cad/kicad/schematic.py index 4f487bd..45a022e 100644 --- a/src/gerbonara/cad/kicad/schematic.py +++ b/gerbonara/cad/kicad/schematic.py @@ -19,7 +19,6 @@ from .symbols import Symbol from . import graphical_primitives as gr from .. import primitives as cad_pr -from ... import __version__ from ... import graphic_primitives as gp from ... import graphic_objects as go @@ -85,12 +84,6 @@ class NoConnect: fill='none', stroke_width='0.254', stroke=colorscheme.no_connect) -@sexp_type('bus_alias') -class BusAlias: - name: str = '' - members: Named(Array(str)) = field(default_factory=list) - - @sexp_type('bus_entry') class BusEntry: at: AtPos = field(default_factory=AtPos) @@ -139,7 +132,7 @@ def _polyline_bounds(self): @sexp_type('wire') class Wire: - points: PointList = field(default_factory=list) + points: PointList = field(default_factory=PointList) stroke: Stroke = field(default_factory=Stroke) uuid: UUID = field(default_factory=UUID) @@ -152,7 +145,7 @@ class Wire: @sexp_type('bus') class Bus: - points: PointList = field(default_factory=list) + points: PointList = field(default_factory=PointList) stroke: Stroke = field(default_factory=Stroke) uuid: UUID = field(default_factory=UUID) @@ -165,9 +158,8 @@ class Bus: @sexp_type('polyline') class Polyline: - points: PointList = field(default_factory=list) + points: PointList = field(default_factory=PointList) stroke: Stroke = field(default_factory=Stroke) - fill: OmitDefault(Fill) = None uuid: UUID = field(default_factory=UUID) def bounding_box(self, default=None): @@ -177,23 +169,33 @@ class Polyline: yield _polyline_svg(self, colorscheme.lines) -@sexp_type('circle') -class Circle: - center: Rename(XYCoord) = field(default_factory=XYCoord) - radius: Named(float) = 0.0 - stroke: Stroke = field(default_factory=Stroke) - fill: OmitDefault(Fill) = None +@sexp_type('text') +class Text(TextMixin): + text: str = '' + exclude_from_sim: Named(YesNoAtom()) = True + at: AtPos = field(default_factory=AtPos) + effects: TextEffect = field(default_factory=TextEffect) uuid: UUID = field(default_factory=UUID) + def to_svg(self, colorscheme=Colorscheme.KiCad): + yield from TextMixin.to_svg(self, colorscheme.text) -@sexp_type('rectangle') -class Rectangle: - start: Rename(XYCoord) = field(default_factory=XYCoord) - end: Rename(XYCoord) = field(default_factory=XYCoord) - stroke: Stroke = field(default_factory=Stroke) - fill: OmitDefault(Fill) = None + +@sexp_type('label') +class LocalLabel(TextMixin): + text: str = '' + at: AtPos = field(default_factory=AtPos) + fields_autoplaced: Wrap(Flag()) = False + effects: TextEffect = field(default_factory=TextEffect) uuid: UUID = field(default_factory=UUID) + @property + def _text_offset(self): + return (0, -2*self.line_width) + + def to_svg(self, colorscheme=Colorscheme.KiCad): + yield from TextMixin.to_svg(self, colorscheme.labels) + def label_shape_path_d(shape, w, h): l, r = { @@ -218,36 +220,16 @@ def label_shape_path_d(shape, w, h): return d + f'L {e+r:.3f} {0:.3f} L {e:.3f} {r:.3f} Z' -@dataclass -class TextLabel(TextMixin): +@sexp_type('global_label') +class GlobalLabel(TextMixin): text: str = '' - shape: Named(AtomChoice(Atom.input, Atom.output, Atom.bidirectional, Atom.tri_state, Atom.passive, Atom.dot, Atom.round, Atom.diamond, Atom.rectangle)) = Atom.passive - exclude_from_sim: Named(YesNoAtom()) = False + shape: Named(AtomChoice(Atom.input, Atom.output, Atom.bidirectional, Atom.tri_state, Atom.passive)) = Atom.input at: AtPos = field(default_factory=AtPos) - fields_autoplaced: Named(YesNoAtom()) = False + fields_autoplaced: Wrap(Flag()) = False effects: TextEffect = field(default_factory=TextEffect) uuid: UUID = field(default_factory=UUID) - properties: List(DrawnProperty) = field(default_factory=list) + properties: List(Property) = field(default_factory=list) - -@sexp_type('text') -class Text(TextLabel): - def to_svg(self, colorscheme=Colorscheme.KiCad): - yield from TextMixin.to_svg(self, colorscheme.text) - - -@sexp_type('label') -class LocalLabel(TextLabel): - @property - def _text_offset(self): - return (0, -2*self.line_width) - - def to_svg(self, colorscheme=Colorscheme.KiCad): - yield from TextMixin.to_svg(self, colorscheme.labels) - - -@sexp_type('global_label') -class GlobalLabel(TextLabel): def to_svg(self, colorscheme=Colorscheme.KiCad): text = super(TextMixin, self).to_svg(colorscheme.labels), text.attrs['transform'] = f'translate({self.size*0.6:.3f} 0)' @@ -258,7 +240,14 @@ class GlobalLabel(TextLabel): @sexp_type('hierarchical_label') -class HierarchicalLabel(TextLabel): +class HierarchicalLabel(TextMixin): + text: str = '' + shape: Named(AtomChoice(Atom.input, Atom.output, Atom.bidirectional, Atom.tri_state, Atom.passive)) = Atom.input + at: AtPos = field(default_factory=AtPos) + fields_autoplaced: Wrap(Flag()) = False + effects: TextEffect = field(default_factory=TextEffect) + uuid: UUID = field(default_factory=UUID) + def to_svg(self, colorscheme=Colorscheme.KiCad): text, = TextMixin.to_svg(self, colorscheme.labels), text.attrs['transform'] = f'translate({self.size*1.2:.3f} 0)' @@ -267,20 +256,10 @@ class HierarchicalLabel(TextLabel): yield Tag('g', children=[frame, text]) -@sexp_type('netclass_flag') -class NetclassFlag(TextLabel): - length: Named(float) = 2.54 - - def to_svg(self, colorscheme=Colorscheme.KiCad): - # FIXME - yield from TextMixin.to_svg(self, colorscheme.text) - - @sexp_type('pin') class Pin: name: str = '1' uuid: UUID = field(default_factory=UUID) - alternate: Named(str) = None # Suddenly, we're doing syntax like this is yaml or something. @@ -289,8 +268,6 @@ class SymbolCrosslinkSheet: path: str = '' reference: Named(str) = '' unit: Named(int) = 1 - value: OmitDefault(Named(str)) = None - footprint: OmitDefault(Named(str)) = None @sexp_type('project') @@ -309,7 +286,6 @@ class MirrorFlags: class DrawnProperty(TextMixin): key: str = None value: str = None - id: Named(int) = None at: AtPos = field(default_factory=AtPos) hide: Flag() = False effects: TextEffect = field(default_factory=TextEffect) @@ -359,14 +335,6 @@ class DrawnProperty(TextMixin): yield from TextMixin.to_svg(self, colorscheme.values) -@sexp_type('default_instance') -class DefaultSymbolInstance: - reference: Named(str) = '' - unit: Named(int) = 1 - value: Named(str) = '' - footprint: Named(str) = '' - - @sexp_type('symbol') class SymbolInstance: name: str = None @@ -379,17 +347,16 @@ class SymbolInstance: in_bom: Named(YesNoAtom()) = True on_board: Named(YesNoAtom()) = True dnp: Named(YesNoAtom()) = True - fields_autoplaced: Named(YesNoAtom()) = True + fields_autoplaced: Wrap(Flag()) = True uuid: UUID = field(default_factory=UUID) - default_instance: DefaultSymbolInstance = None properties: List(DrawnProperty) = field(default_factory=list) # AFAICT this property is completely redundant. pins: List(Pin) = field(default_factory=list) # AFAICT this property, too, is completely redundant. It ultimately just lists paths and references of at most # three other uses of the same symbol in this schematic. - instances: Named(Array(SymbolCrosslinkProject)) = field(default_factory=list) + instances: Named(List(SymbolCrosslinkProject)) = field(default_factory=list) _ : SEXP_END = None - schematic: object = field(repr=False, default=None) + schematic: object = None def __after_parse__(self, parent): self.schematic = parent @@ -517,11 +484,7 @@ class SubsheetFill: class Subsheet: at: Rename(XYCoord) = field(default_factory=XYCoord) size: Rename(XYCoord) = field(default_factory=lambda: XYCoord(2.54, 2.54)) - exclude_from_sim: Named(YesNoAtom()) = False - in_bom: Named(YesNoAtom()) = False - on_board: Named(YesNoAtom()) = False - dnp: Named(YesNoAtom()) = False - fields_autoplaced: Named(YesNoAtom()) = True + fields_autoplaced: Wrap(Flag()) = True stroke: Stroke = field(default_factory=Stroke) fill: SubsheetFill = field(default_factory=SubsheetFill) uuid: UUID = field(default_factory=UUID) @@ -532,10 +495,10 @@ class Subsheet: _ : SEXP_END = None sheet_name: object = field(default_factory=lambda: DrawnProperty('Sheetname', '')) file_name: object = field(default_factory=lambda: DrawnProperty('Sheetfile', '')) - schematic: object = field(repr=False, default=None) + schematic: object = None def __after_parse__(self, parent): - self.sheet_name, self.file_name, *_extra_params = self._properties + self.sheet_name, self.file_name = self._properties self.schematic = parent def __before_sexp__(self): @@ -580,28 +543,6 @@ class Subsheet: **self.stroke.svg_attrs(colorscheme.lines)) -@sexp_type('rule_area') -class RuleArea: - polyline: Polyline = None - - -@sexp_type('text_box') -class TextBox(TextMixin): - text: str = None - exclude_from_sim: Named(YesNoAtom()) = False - at: AtPos = field(default_factory=AtPos) - size: Rename(XYCoord) = None - margins: Rename(gr.Margins) = None - effects: TextEffect = field(default_factory=TextEffect) - stroke: Stroke = field(default_factory=Stroke) - fill: OmitDefault(Fill) = None - effects: TextEffect = field(default_factory=TextEffect) - uuid: UUID = field(default_factory=UUID) - - def render(self, variables={}, cache=None): - yield from gr.TextBox.render(self, variables=variables) - - @sexp_type('lib_symbols') class LocalLibrary: symbols: List(Symbol) = field(default_factory=list) @@ -611,39 +552,26 @@ SUPPORTED_FILE_FORMAT_VERSIONS = [20230620] @sexp_type('kicad_sch') class Schematic: _version: Named(int, name='version') = 20230620 - generator: Named(str) = 'gerbonara' - generator_version: Named(str) = __version__ - legacy_generator: Named(Array(str), name='host') = None + generator: Named(Atom) = Atom.gerbonara uuid: UUID = field(default_factory=UUID) page_settings: PageSettings = field(default_factory=PageSettings) - legacy_page: Named(Array(int), name='page') = None - legacy_paper: Named(str, name='paper') = None - title_block: TitleBlock = None # The doc says this is expected, but eeschema barfs when it's there. # path: SheetPath = field(default_factory=SheetPath) lib_symbols: LocalLibrary = field(default_factory=list) junctions: List(Junction) = field(default_factory=list) no_connects: List(NoConnect) = field(default_factory=list) - rule_areas: List(RuleArea) = field(default_factory=list) - netclass_flags: List(NetclassFlag) = field(default_factory=list) - bus_aliases: List(BusAlias) = field(default_factory=list) bus_entries: List(BusEntry) = field(default_factory=list) wires: List(Wire) = field(default_factory=list) buses: List(Bus) = field(default_factory=list) images: List(gr.Image) = field(default_factory=list) polylines: List(Polyline) = field(default_factory=list) - circles: List(Circle) = field(default_factory=list) - rectangles: List(Rectangle) = field(default_factory=list) texts: List(Text) = field(default_factory=list) - text_boxes: List(TextBox) = field(default_factory=list) local_labels: List(LocalLabel) = field(default_factory=list) global_labels: List(GlobalLabel) = field(default_factory=list) hierarchical_labels: List(HierarchicalLabel) = field(default_factory=list) symbols: List(SymbolInstance) = field(default_factory=list) subsheets: List(Subsheet) = field(default_factory=list) - sheet_instances: Named(Array(SubsheetCrosslinkSheet)) = field(default_factory=list) - symbol_instances: Named(Array(SymbolCrosslinkProject)) = field(default_factory=list) - embedded_fonts: Named(YesNoAtom()) = False + sheet_instances: Named(List(SubsheetCrosslinkSheet)) = field(default_factory=list) _ : SEXP_END = None original_filename: str = None diff --git a/src/gerbonara/cad/kicad/schematic_colors.py b/gerbonara/cad/kicad/schematic_colors.py similarity index 100% rename from src/gerbonara/cad/kicad/schematic_colors.py rename to gerbonara/cad/kicad/schematic_colors.py diff --git a/src/gerbonara/cad/kicad/sexp.py b/gerbonara/cad/kicad/sexp.py similarity index 99% rename from src/gerbonara/cad/kicad/sexp.py rename to gerbonara/cad/kicad/sexp.py index edc31c2..9312489 100644 --- a/src/gerbonara/cad/kicad/sexp.py +++ b/gerbonara/cad/kicad/sexp.py @@ -64,7 +64,7 @@ term_regex = r"""(?mx) (\))| ([+-]?\d+\.\d+(?=[\s\)]))| (\-?\d+(?=[\s\)]))| - ([^"\s()][^"\s)]*) + ([^0-9"\s()][^"\s)]*) )""" diff --git a/src/gerbonara/cad/kicad/sexp_mapper.py b/gerbonara/cad/kicad/sexp_mapper.py similarity index 72% rename from src/gerbonara/cad/kicad/sexp_mapper.py rename to gerbonara/cad/kicad/sexp_mapper.py index afd61dc..d2d9d30 100644 --- a/src/gerbonara/cad/kicad/sexp_mapper.py +++ b/gerbonara/cad/kicad/sexp_mapper.py @@ -28,10 +28,6 @@ class AtomChoice: def __sexp__(self, value): yield value - def __str__(self): - choices = '|'.join(map(str, self.choices)) - return f'AtomChoice({choices})' - class Flag: def __init__(self, atom=None, invert=None): @@ -52,11 +48,6 @@ class Flag: def __sexp__(self, value): if bool(value) == (not self.invert): yield self.atom - - def __str__(self): - if self.invert is not None: - return f'Flag({self.atom}/{self.invert})' - return f'Flag({self.atom})' def sexp(t, v): @@ -85,7 +76,7 @@ class MappingError(TypeError): super().__init__(msg) self.t, self.sexp = t, sexp -def map_sexp(t, v, parent=None, path=''): +def map_sexp(t, v, parent=None): try: if t is not Atom and hasattr(t, '__map__'): return t.__map__(v, parent=parent) @@ -102,7 +93,7 @@ def map_sexp(t, v, parent=None, path=''): elif isinstance(t, list): t, = t - return [map_sexp(t, elem, parent=parent, path=f'{path}/{t}') for elem in v] + return [map_sexp(t, elem, parent=parent) for elem in v] else: raise TypeError(f'Python type {t} has no defined s-expression deserialization') @@ -111,7 +102,7 @@ def map_sexp(t, v, parent=None, path=''): raise e except Exception as e: - raise MappingError(f'Error at {path} trying to map {textwrap.shorten(str(v), width=60)} into type {t}', t, v) from e + raise MappingError(f'Error trying to map {textwrap.shorten(str(v), width=120)} into type {t}', t, v) from e class WrapperType: @@ -120,8 +111,7 @@ class WrapperType: def __bind_field__(self, field): self.field = field - if self.next_type is not Atom: - getattr(self.next_type, '__bind_field__', lambda x: None)(field) + getattr(self.next_type, '__bind_field__', lambda x: None)(field) def __atoms__(self): if hasattr(self, 'name_atom'): @@ -143,12 +133,12 @@ class Named(WrapperType): if self.name_atom is None: self.name_atom = Atom(field.name) - def __map__(self, obj, parent=None, path=''): + def __map__(self, obj, parent=None): k, *obj = obj if self.next_type in (int, float, str, Atom) or isinstance(self.next_type, AtomChoice): - return map_sexp(self.next_type, [*obj], parent=parent, path=f'{path}/{self.name_atom}') + return map_sexp(self.next_type, [*obj], parent=parent) else: - return map_sexp(self.next_type, obj, parent=parent, path=f'{path}/{self.name_atom}') + return map_sexp(self.next_type, obj, parent=parent) def __sexp__(self, value): value = sexp(self.next_type, value) @@ -160,9 +150,6 @@ class Named(WrapperType): yield [self.name_atom, *value] - def __str__(self): - return f'Named={self.name_atom}({self.next_type})' - class Rename(WrapperType): def __init__(self, next_type, name=None): @@ -175,8 +162,8 @@ class Rename(WrapperType): if hasattr(self.next_type, '__bind_field__'): self.next_type.__bind_field__(field) - def __map__(self, obj, parent=None, path=''): - return map_sexp(self.next_type, obj, parent=parent, path=f'{path}/{self.name_atom}') + def __map__(self, obj, parent=None): + return map_sexp(self.next_type, obj, parent=parent) def __sexp__(self, value): value, = sexp(self.next_type, value) @@ -186,9 +173,6 @@ class Rename(WrapperType): key, *rest = value yield [self.name_atom, *rest] - def __str__(self): - return f'Rename={self.name_atom}({self.next_type})' - class OmitDefault(WrapperType): def __bind_field__(self, field): @@ -198,42 +182,19 @@ class OmitDefault(WrapperType): else: self.default = field.default - def __map__(self, obj, parent=None, path=''): - return map_sexp(self.next_type, obj, parent=parent, path=path) + def __map__(self, obj, parent=None): + return map_sexp(self.next_type, obj, parent=parent) def __sexp__(self, value): if value != self.default: yield from sexp(self.next_type, value) - def __str__(self): - return f'OmitDefault({self.field})' - class YesNoAtom: def __init__(self, yes=Atom.yes, no=Atom.no): self.yes, self.no = yes, no def __map__(self, value, parent=None): - if not value: # compatibility with legacy flag style - return False - value, = value - return value == self.yes - - def __sexp__(self, value): - yield self.yes if value else self.no - - -class LegacyCompatibleFlag: - '''Variant of YesNoAtom that accepts both the `(flag )` variant and the bare `flag` variant for compatibility.''' - - def __init__(self, yes=Atom.yes, no=Atom.no, value_when_empty=True): - self.yes, self.no = yes, no - self.value_when_empty = value_when_empty - - def __map__(self, value, parent=None): - if value == []: - return self.value_when_empty - value, = value return value == self.yes @@ -242,50 +203,41 @@ class LegacyCompatibleFlag: class Wrap(WrapperType): - def __map__(self, value, parent=None, path=''): + def __map__(self, value, parent=None): value, = value - return map_sexp(self.next_type, value, parent=parent, path=path) + return map_sexp(self.next_type, value, parent=parent) def __sexp__(self, value): for inner in sexp(self.next_type, value): yield [inner] - def __str__(self): - return f'Wrap({self.next_type})' - class Array(WrapperType): - def __map__(self, value, parent=None, path=''): - return [map_sexp(self.next_type, [elem], parent=parent, path=path) for elem in value] + def __map__(self, value, parent=None): + return [map_sexp(self.next_type, [elem], parent=parent) for elem in value] def __sexp__(self, value): for e in value: yield from sexp(self.next_type, e) - def __str__(self): - return f'Array({self.next_type})' - class Untagged(WrapperType): - def __map__(self, value, parent=None, path=''): + def __map__(self, value, parent=None): value, = value - return self.next_type.__map__([self.next_type.name_atom, *value], parent=parent, path=path) + return self.next_type.__map__([self.next_type.name_atom, *value], parent=parent) def __sexp__(self, value): for inner in sexp(self.next_type, value): _tag, *rest = inner yield rest - def __str__(self): - return f'Untagged({self.next_type})' - class List(WrapperType): def __bind_field__(self, field): self.attr = field.name - def __map__(self, value, parent, path=''): + def __map__(self, value, parent): l = getattr(parent, self.attr, []) - mapped = map_sexp(self.next_type, value, parent=parent, path=f'{path}/{self.attr}') + mapped = map_sexp(self.next_type, value, parent=parent) l.append(mapped) setattr(parent, self.attr, l) @@ -293,9 +245,6 @@ class List(WrapperType): for elem in value: yield from sexp(self.next_type, elem) - def __str__(self): - return f'List@{self.attr}({self.next_type})' - class _SexpTemplate: @staticmethod @@ -303,32 +252,22 @@ class _SexpTemplate: return [kls.name_atom] @staticmethod - def __map__(kls, value, *args, parent=None, path='', **kwargs): + def __map__(kls, value, *args, parent=None, **kwargs): positional = iter(kls.positional) inst = kls(*args, **kwargs) for v in value[1:]: # skip key if isinstance(v, Atom) and v in kls.keys: name, etype = kls.keys[v] - mapped = map_sexp(etype, [v], parent=inst, path=f'{path}/{kls.name_atom}') + mapped = map_sexp(etype, [v], parent=inst) if mapped is not None: setattr(inst, name, mapped) elif isinstance(v, list): - key = v[0] - if key in kls.keys: - name, etype = kls.keys[key] - mapped = map_sexp(etype, v, parent=inst, path=f'{path}/{kls.name_atom}') - if mapped is not None: - setattr(inst, name, mapped) - - elif hasattr(inst, '__catchall__'): - inst.__catchall__(v, path=f'{path}/{kls.name_atom}') - - else: - #print('class has keys:') - #print('\n'.join(map(str, kls.keys))) - raise TypeError(f'Unhandled keyed argument {v!r} while parsing {kls}') + name, etype = kls.keys[v[0]] + mapped = map_sexp(etype, v, parent=inst) + if mapped is not None: + setattr(inst, name, mapped) else: try: diff --git a/src/gerbonara/cad/kicad/symbols.py b/gerbonara/cad/kicad/symbols.py similarity index 93% rename from src/gerbonara/cad/kicad/symbols.py rename to gerbonara/cad/kicad/symbols.py index c742e08..baa77bb 100644 --- a/src/gerbonara/cad/kicad/symbols.py +++ b/gerbonara/cad/kicad/symbols.py @@ -18,15 +18,13 @@ from .sexp import * from .sexp_mapper import * from .base_types import * from ...utils import rotate_point, Tag, arc_bounds -from ... import __version__ from ...newstroke import Newstroke from .schematic_colors import * -from .primitives import kicad_mid_to_center_arc, Margins PIN_ETYPE = AtomChoice(Atom.input, Atom.output, Atom.bidirectional, Atom.tri_state, Atom.passive, Atom.free, Atom.unspecified, Atom.power_in, Atom.power_out, Atom.open_collector, Atom.open_emitter, - Atom.no_connect, Atom.unconnected) + Atom.no_connect) PIN_STYLE = AtomChoice(Atom.line, Atom.inverted, Atom.clock, Atom.inverted_clock, Atom.input_low, Atom.clock_low, @@ -52,7 +50,7 @@ class Pin: style: PIN_STYLE = Atom.line at: AtPos = field(default_factory=AtPos) length: Named(float) = 2.54 - hide: OmitDefault(Named(YesNoAtom())) = False + hide: Flag() = False name: Rename(StyledText) = field(default_factory=StyledText) number: Rename(StyledText) = field(default_factory=StyledText) alternates: List(AltFunction) = field(default_factory=list) @@ -251,11 +249,26 @@ class Circle: **self.stroke.svg_attrs(colorscheme.lines)) -@sexp_type('radius') -class ArcRadius: - at: AtPos = field(default_factory=AtPos) - length: Named(float) = 0.0 - angles: Rename(XYCoord) = field(default_factory=XYCoord) +# https://stackoverflow.com/questions/28910718/give-3-points-and-a-plot-circle +def define_circle(p1, p2, p3): + """ + Returns the center and radius of the circle passing the given 3 points. + In case the 3 points form a line, raises a ValueError. + """ + temp = p2[0] * p2[0] + p2[1] * p2[1] + bc = (p1[0] * p1[0] + p1[1] * p1[1] - temp) / 2 + cd = (temp - p3[0] * p3[0] - p3[1] * p3[1]) / 2 + det = (p1[0] - p2[0]) * (p2[1] - p3[1]) - (p2[0] - p3[0]) * (p1[1] - p2[1]) + + if abs(det) < 1.0e-6: + raise ValueError() + + # Center of circle + cx = (bc*(p2[1] - p3[1]) - cd*(p1[1] - p2[1])) / det + cy = ((p1[0] - p2[0]) * cd - (p2[0] - p3[0]) * bc) / det + + radius = math.sqrt((cx - p1[0])**2 + (cy - p1[1])**2) + return ((cx, cy), radius) @sexp_type('arc') @@ -263,12 +276,11 @@ class Arc: start: Rename(XYCoord) = field(default_factory=XYCoord) mid: Rename(XYCoord) = field(default_factory=XYCoord) end: Rename(XYCoord) = field(default_factory=XYCoord) - radius: ArcRadius = None stroke: Stroke = field(default_factory=Stroke) fill: Fill = field(default_factory=Fill) def bounding_box(self, default=None): - (cx, cy), r = kicad_mid_to_center_arc(self.mid, self.start, self.end) + (cx, cy), r = define_circle((self.start.x, self.start.y), (self.mid.x, self.mid.y), (self.end.x, self.end.y)) x1, y1 = self.start.x, self.start.y x2, y2 = self.mid.x-x1, self.mid.y-x2 x3, y3 = (self.end.x - x1)/2, (self.end.y - y1)/2 @@ -277,7 +289,7 @@ class Arc: def to_svg(self, colorscheme=Colorscheme.KiCad): - (cx, cy), r = kicad_mid_to_center_arc(self.mid, self.start, self.end) + (cx, cy), r = define_circle((self.start.x, self.start.y), (self.mid.x, self.mid.y), (self.end.x, self.end.y)) x1r = self.start.x - cx y1r = self.start.y - cy @@ -404,12 +416,10 @@ class Rectangle: @sexp_type('property') class Property(TextMixin): - private: Flag() = False name: str = None value: str = None id: Named(int) = None at: AtPos = field(default_factory=AtPos) - show_name: Flag() = False effects: TextEffect = field(default_factory=TextEffect) # Alias value for text mixin @@ -427,24 +437,13 @@ class Property(TextMixin): @sexp_type('pin_numbers') class PinNumberSpec: - hide: Named(YesNoAtom()) = False + hide: Flag() = False @sexp_type('pin_names') class PinNameSpec: offset: OmitDefault(Named(float)) = 0.508 - hide: OmitDefault(Named(YesNoAtom())) = False - -@sexp_type('text_box') -class TextBox: - text: str = '' - exclude_from_sim: OmitDefault(Named(YesNoAtom())) = False - at: AtPos = field(default_factory=AtPos) - size: Rename(XYCoord) = field(default_factory=XYCoord) - margins: Margins = None - stroke: Stroke = field(default_factory=Stroke) - fill: Fill = field(default_factory=Fill) - effects: TextEffect = field(default_factory=TextEffect) + hide: Flag() = False @sexp_type('symbol') @@ -455,7 +454,6 @@ class Unit: polylines: List(Polyline) = field(default_factory=list) rectangles: List(Rectangle) = field(default_factory=list) texts: List(Text) = field(default_factory=list) - text_boxes: List(TextBox) = field(default_factory=list) pins: List(Pin) = field(default_factory=list) unit_name: Named(str) = None _ : SEXP_END = None @@ -504,12 +502,10 @@ class Symbol: pin_numbers: OmitDefault(PinNumberSpec) = field(default_factory=PinNumberSpec) pin_names: OmitDefault(PinNameSpec) = field(default_factory=PinNameSpec) exclude_from_sim: OmitDefault(Named(YesNoAtom())) = False - exclude_from_sim: Named(YesNoAtom()) = False in_bom: Named(YesNoAtom()) = True on_board: Named(YesNoAtom()) = True properties: List(Property) = field(default_factory=list) units: List(Unit) = field(default_factory=list) - embedded_fonts: Named(YesNoAtom()) = False _ : SEXP_END = None library = None name: str = None @@ -598,8 +594,7 @@ SUPPORTED_FILE_FORMAT_VERSIONS = [20211014, 20220914] @sexp_type('kicad_symbol_lib') class Library: _version: Named(int, name='version') = 20211014 - generator: Named(str) = Atom.gerbonara - generator_version: Named(str) = __version__ + generator: Named(Atom) = Atom.gerbonara symbols: List(Symbol) = field(default_factory=list) _ : SEXP_END = None original_filename: str = None diff --git a/src/gerbonara/cad/kicad/tmtheme.py b/gerbonara/cad/kicad/tmtheme.py similarity index 100% rename from src/gerbonara/cad/kicad/tmtheme.py rename to gerbonara/cad/kicad/tmtheme.py diff --git a/src/gerbonara/cad/primitives.py b/gerbonara/cad/primitives.py similarity index 93% rename from src/gerbonara/cad/primitives.py rename to gerbonara/cad/primitives.py index f581c38..6ffd4e2 100644 --- a/src/gerbonara/cad/primitives.py +++ b/gerbonara/cad/primitives.py @@ -4,7 +4,7 @@ import math import warnings from copy import copy from itertools import zip_longest, chain -from dataclasses import dataclass, field, replace, KW_ONLY +from dataclasses import dataclass, field, KW_ONLY from collections import defaultdict from ..utils import LengthUnit, MM, rotate_point, svg_arc, sum_bounds, bbox_intersect, Tag, offset_bounds @@ -14,9 +14,6 @@ from ..apertures import Aperture, CircleAperture, ObroundAperture, RectangleAper from ..newstroke import Newstroke -class UNDEFINED: - pass - def sgn(x): return -1 if x < 0 else 1 @@ -118,7 +115,7 @@ class Board: def layer_stack(self, layer_stack=None): if layer_stack is None: - layer_stack = LayerStack(board_name='proto') + layer_stack = LayerStack() cache = {} for obj in chain(self.objects): @@ -322,7 +319,6 @@ class Text(Positioned): xs = [x for points in strokes for x, _y in points] ys = [y for points in strokes for _x, y in points] min_x, min_y, max_x, max_y = min(xs), min(ys), max(xs), max(ys) - h = self.font_size + self.stroke_width # (max_y - min_y) if self.h_align == 'left': x0 = 0 @@ -333,16 +329,16 @@ class Text(Positioned): else: raise ValueError('h_align must be one of "left", "center", or "right".') - if self.v_align == 'bottom': - y0 = h + if self.v_align == 'top': + y0 = -(max_y - min_y) elif self.v_align == 'middle': - y0 = h/2 - elif self.v_align == 'top': + y0 = -(max_y - min_y)/2 + elif self.v_align == 'bottom': y0 = 0 else: raise ValueError('v_align must be one of "top", "middle", or "bottom".') - if self.flip: + if self.side == 'bottom': x0 += min_x + max_x x_sign = -1 else: @@ -352,7 +348,7 @@ class Text(Positioned): for stroke in strokes: for (x1, y1), (x2, y2) in zip(stroke[:-1], stroke[1:]): - obj = Line(x0+x_sign*x1, y0+y1, x0+x_sign*x2, y0+y2, aperture=ap, unit=self.unit, polarity_dark=self.polarity_dark) + obj = Line(x0+x_sign*x1, y0-y1, x0+x_sign*x2, y0-y2, aperture=ap, unit=self.unit, polarity_dark=self.polarity_dark) obj.rotate(rotation) obj.offset(obj_x, obj_y) layer_stack['bottom' if flip else 'top', self.layer].objects.append(obj) @@ -369,11 +365,11 @@ class Text(Positioned): x0 = -approx_w if self.v_align == 'top': - y0 = 0 + y0 = -approx_h elif self.v_align == 'middle': y0 = -approx_h/2 elif self.v_align == 'bottom': - y0 = -approx_h + y0 = 0 return (self.x+x0, self.y+y0), (self.x+x0+approx_w, self.y+y0+approx_h) @@ -386,7 +382,6 @@ class PadStackAperture: offset_x: float = 0 # in PadStack units offset_y: float = 0 rotation: float = 0 - invert: bool = False @dataclass(frozen=True, slots=True) @@ -401,20 +396,20 @@ class PadStack: def flashes(self, x, y, rotation: float = 0, flip: bool = False): for ap in self.apertures: aperture = ap.aperture.rotated(ap.rotation + rotation) - fl = Flash(ap.offset_x, ap.offset_y, aperture, polarity_dark=not ap.invert, unit=self.unit) + fl = Flash(ap.offset_x, ap.offset_y) fl.rotate(rotation) fl.offset(x, y) - side = ap.side + side = fl.side if flip: side = {'top': 'bottom', 'bottom': 'top'}.get(side, side) - yield side, ap.layer, fl + yield side, fl.layer, fl def render(self, layer_stack, x, y, rotation: float = 0, flip: bool = False): for side, layer, flash in self.flashes(x, y, rotation, flip): - if side == 'drill' and layer == 'plated': + if side == 'drill' and use == 'plated': layer_stack.drill_pth.objects.append(flash) - elif side == 'drill' and layer == 'nonplated': + elif side == 'drill' and use == 'nonplated': layer_stack.drill_npth.objects.append(flash) elif (side, layer) in layer_stack: @@ -454,37 +449,17 @@ class SMDStack(PadStack): return kls(CircleAperture(dia, unit=unit), mask_expansion, paste_expansion, paste, flip, unit=unit) -@dataclass(frozen=True, slots=True) -class MechanicalHoleStack(PadStack): - drill_dia: float - mask_expansion: float = 0.0 - mask_aperture = None - - @property - def apertures(self): - mask_aperture = self.mask_aperture or CircleAperture(self.drill_dia + self.mask_expansion, unit=self.unit) - yield PadStackAperture(mask_aperture, 'top', 'mask') - yield PadStackAperture(mask_aperture, 'bottom', 'mask') - - @property - def single_sided(self): - return False - - @dataclass(frozen=True, slots=True) class THTPad(PadStack): drill_dia: float pad_top: SMDStack pad_bottom: SMDStack = None - aperture_inner: Aperture = UNDEFINED + aperture_inner: Aperture = None plated: bool = True def __post_init__(self): if self.pad_bottom is None: object.__setattr__(self, 'pad_bottom', replace(self.pad_top, flip=True)) - - if self.aperture_inner is UNDEFINED: - object.__setattr__(self, 'aperture_inner', self.pad_top.aperture) if self.pad_top.flip: raise ValueError('top pad cannot be flipped') @@ -497,8 +472,7 @@ class THTPad(PadStack): def apertures(self): yield from self.pad_top.apertures yield from self.pad_bottom.apertures - if self.aperture_inner is not None: - yield PadStackAperture(self.aperture_inner, 'inner', 'copper') + yield PadStackAperture(self.aperture_inner, 'inner', 'copper') yield PadStackAperture(ExcellonTool(self.drill_dia, plated=self.plated, unit=self.unit), 'drill', self.plating) @property @@ -512,7 +486,7 @@ class THTPad(PadStack): @classmethod def circle(kls, drill_dia, dia, rotation=0, mask_expansion=0.0, paste_expansion=0.0, paste=True, plated=True, unit=MM): - pad = SMDStack.circle(dia, mask_expansion, paste_expansion, paste, unit=unit) + pad = SMDStack.circle(dia, rotation, mask_expansion, paste_expansion, paste, unit=unit) return kls(drill_dia, pad, plated=plated) @classmethod @@ -564,10 +538,6 @@ class Via(FrozenPositioned): class Pad(Positioned): pad_stack: PadStack - def render(self, layer_stack, cache=None): - x, y, rotation, flip = self.abs_pos - self.pad_stack.render(layer_stack, x, y, rotation, flip) - @property def single_sided(self): return self.pad_stack.single_sided diff --git a/gerbonara/cad/protoboard.py b/gerbonara/cad/protoboard.py new file mode 100644 index 0000000..91b07d1 --- /dev/null +++ b/gerbonara/cad/protoboard.py @@ -0,0 +1,739 @@ + +import sys +import re +import math +import string +import itertools +from copy import copy, deepcopy +import warnings +import importlib.resources + +from ..utils import MM, rotate_point +from .primitives import * +from ..graphic_objects import Region +from ..apertures import RectangleAperture, CircleAperture, ApertureMacroInstance +from ..aperture_macros.parse import ApertureMacro, VariableExpression +from ..aperture_macros import primitive as amp +from .kicad import footprints as kfp +from . import data as package_data + + +class ProtoBoard(Board): + def __init__(self, w, h, content, margin=None, corner_radius=None, mounting_hole_dia=None, mounting_hole_offset=None, unit=MM): + corner_radius = corner_radius or unit(1.5, MM) + super().__init__(w, h, corner_radius, unit=unit) + self.margin = margin or unit(2, MM) + self.content = content + + if mounting_hole_dia: + mounting_hole_offset = mounting_hole_offset or mounting_hole_dia*2 + ko = mounting_hole_offset*2 + + self.add(Hole(mounting_hole_offset, mounting_hole_offset, mounting_hole_dia, unit=unit)) + self.add(Hole(w-mounting_hole_offset, mounting_hole_offset, mounting_hole_dia, unit=unit)) + self.add(Hole(mounting_hole_offset, h-mounting_hole_offset, mounting_hole_dia, unit=unit)) + self.add(Hole(w-mounting_hole_offset, h-mounting_hole_offset, mounting_hole_dia, unit=unit)) + + self.keepouts.append(((0, 0), (ko, ko))) + self.keepouts.append(((w-ko, 0), (w, ko))) + self.keepouts.append(((0, h-ko), (ko, h))) + self.keepouts.append(((w-ko, h-ko), (w, h))) + + self.generate() + + def generate(self, unit=MM): + bbox = ((self.margin, self.margin), (self.w-self.margin, self.h-self.margin)) + bbox = unit.convert_bounds_from(self.unit, bbox) + for obj in self.content.generate(bbox, (True, True, True, True), unit): + self.add(obj, keepout_errors='skip') + + +class PropLayout: + def __init__(self, content, direction, proportions): + self.content = list(content) + if direction not in ('h', 'v'): + raise ValueError('direction must be one of "h", or "v".') + self.direction = direction + self.proportions = list(proportions) + if len(content) != len(proportions): + raise ValueError('proportions and content must have same length') + + def generate(self, bbox, border_text, unit=MM): + for i, (bbox, child) in enumerate(self.layout_2d(bbox, unit)): + first = bool(i == 0) + last = bool(i == len(self.content)-1) + yield from child.generate(bbox, ( + border_text[0] and (last or self.direction == 'h'), + border_text[1] and (last or self.direction == 'v'), + border_text[2] and (first or self.direction == 'h'), + border_text[3] and (first or self.direction == 'v'), + ), unit) + + def fit_size(self, w, h, unit=MM): + widths = [] + heights = [] + for ((x_min, y_min), (x_max, y_max)), child in self.layout_2d(((0, 0), (w, h)), unit): + if not isinstance(child, EmptyProtoArea): + widths.append(x_max - x_min) + heights.append(y_max - y_min) + if self.direction == 'h': + return sum(widths), max(heights, default=0) + else: + return max(widths, default=0), sum(heights) + + def layout_2d(self, bbox, unit=MM): + (x, y), (w, h) = bbox + w, h = w-x, h-y + + actual_l = 0 + target_l = 0 + + for l, child in zip(self.layout(w if self.direction == 'h' else h, unit), self.content): + this_x, this_y = x, y + this_w, this_h = w, h + target_l += l + + if self.direction == 'h': + this_w = target_l - actual_l + else: + this_h = target_l - actual_l + + this_w, this_h = child.fit_size(this_w, this_h, unit) + + if self.direction == 'h': + x += this_w + actual_l += this_w + this_h = h + else: + y += this_h + actual_l += this_h + this_w = w + + yield ((this_x, this_y), (this_x+this_w, this_y+this_h)), child + + def layout(self, length, unit=MM): + out = [ eval_value(value, MM(length, unit)) for value in self.proportions ] + total_length = sum(value for value in out if value is not None) + if length - total_length < -1e-6: + raise ValueError(f'Proportions sum to {total_length} mm, which is greater than the available space of {length} mm.') + + leftover = length - total_length + sum_props = sum( (value or 1.0) for value in self.proportions if not isinstance(value, str) ) + return [ unit(leftover * (value or 1.0) / sum_props if not isinstance(value, str) else calculated, MM) + for value, calculated in zip(self.proportions, out) ] + + @property + def single_sided(self): + return all(elem.single_sided for elem in self.content) + + def __str__(self): + children = ', '.join( f'{elem}:{width}' for elem, width in zip(self.content, self.proportions)) + return f'PropLayout[{self.direction.upper()}]({children})' + + +class TwoSideLayout: + def __init__(self, top, bottom): + self.top, self.bottom = top, bottom + + if not top.single_sided or not bottom.single_sided: + warnings.warn('Two-sided pattern used on one side of a TwoSideLayout') + + def fit_size(self, w, h, unit=MM): + w1, h1 = self.top.fit_size(w, h, unit) + w2, h2 = self.bottom.fit_size(w, h, unit) + if isinstance(self.top, EmptyProtoArea): + if isinstance(self.bottom, EmptyProtoArea): + return w1, h1 + return w2, h2 + if isinstance(self.bottom, EmptyProtoArea): + return w1, h1 + return max(w1, w2), max(h1, h2) + + def generate(self, bbox, border_text, unit=MM): + yield from self.top.generate(bbox, border_text, unit) + for obj in self.bottom.generate(bbox, border_text, unit): + obj.side = 'bottom' + yield obj + + +def numeric(start=1): + def gen(): + nonlocal start + for i in itertools.count(start): + yield str(i) + + return gen + + +def alphabetic(case='upper'): + if case not in ('lower', 'upper'): + raise ValueError('case must be one of "lower" or "upper".') + + index = string.ascii_lowercase if case == 'lower' else string.ascii_uppercase + + def gen(): + nonlocal index + + for i in itertools.count(): + if i<26: + yield index[i] + continue + + i -= 26 + if i<26*26: + yield index[i//26] + index[i%26] + continue + + i -= 26*26 + if i<26*26*26: + yield index[i//(26*26)] + index[(i//26)%26] + index[i%26] + + else: + raise ValueError('row/column index out of range') + + return gen + + +class PatternProtoArea: + def __init__(self, pitch_x, pitch_y=None, obj=None, numbers=True, font_size=None, font_stroke=None, number_x_gen=alphabetic(), number_y_gen=numeric(), interval_x=5, interval_y=None, margin=0, unit=MM): + self.pitch_x = pitch_x + self.pitch_y = pitch_y or pitch_x + self.margin = margin + self.obj = obj + self.unit = unit + self.numbers = numbers + self.font_size = font_size or unit(1.0, MM) + self.font_stroke = font_stroke or unit(0.2, MM) + self.interval_x = interval_x + self.interval_y = interval_y or (1 if MM(self.pitch_y, unit) >= 2.0 else 5) + self.number_x_gen, self.number_y_gen = number_x_gen, number_y_gen + + def fit_size(self, w, h, unit=MM): + (min_x, min_y), (max_x, max_y) = self.fit_rect(((0, 0), (max(0, w-2*self.margin), max(0, h-2*self.margin)))) + return max_x-min_x + 2*self.margin, max_y-min_y + 2*self.margin + + def fit_rect(self, bbox, unit=MM): + (x, y), (w, h) = bbox + x, y = x+self.margin, y+self.margin + w, h = w-x-self.margin, h-y-self.margin + + w_mod = round((w + 5e-7) % unit(self.pitch_x, self.unit), 6) + h_mod = round((h + 5e-7) % unit(self.pitch_y, self.unit), 6) + w_fit, h_fit = round(w - w_mod, 6), round(h - h_mod, 6) + + x = x + (w-w_fit)/2 + y = y + (h-h_fit)/2 + return (x, y), (x+w_fit, y+h_fit) + + def generate(self, bbox, border_text, unit=MM): + (x, y), (w, h) = bbox + w, h = w-x, h-y + + n_x = int(w//unit(self.pitch_x, self.unit)) + n_y = int(h//unit(self.pitch_y, self.unit)) + off_x = (w % unit(self.pitch_x, self.unit)) / 2 + off_y = (h % unit(self.pitch_y, self.unit)) / 2 + + if self.numbers: + for i, lno_i in list(zip(range(n_y), self.number_y_gen())): + if i == 0 or i == n_y - 1 or (i+1) % self.interval_y == 0: + t_y = off_y + y + (n_y - 1 - i + 0.5) * self.pitch_y + + if border_text[3]: + t_x = x + off_x + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'right', 'middle', unit=self.unit) + if not self.single_sided: + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'right', 'middle', side='bottom', unit=self.unit) + + if border_text[1]: + t_x = x + w - off_x + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'left', 'middle', unit=self.unit) + if not self.single_sided: + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'left', 'middle', side='bottom', unit=self.unit) + + for i, lno_i in zip(range(n_x), self.number_x_gen()): + if i == 0 or i == n_x - 1 or (i+1) % self.interval_x == 0: + t_x = off_x + x + (i + 0.5) * self.pitch_x + + if border_text[2]: + t_y = y + off_y + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'center', 'top', unit=self.unit) + if not self.single_sided: + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'center', 'top', side='bottom', unit=self.unit) + + if border_text[0]: + t_y = y + h - off_y + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'center', 'bottom', unit=self.unit) + if not self.single_sided: + yield Text(t_x, t_y, lno_i, self.font_size, self.font_stroke, 'center', 'bottom', side='bottom', unit=self.unit) + + + for i in range(n_x): + for j in range(n_y): + if hasattr(self.obj, 'inst'): + inst = self.obj.inst(i, j, i == n_x-1, j == n_y-1) + if not inst: + continue + else: + inst = copy(self.obj) + + inst.x = inst.unit(off_x + x, unit) + (i + 0.5) * inst.unit(self.pitch_x, self.unit) + inst.y = inst.unit(off_y + y, unit) + (j + 0.5) * inst.unit(self.pitch_y, self.unit) + yield inst + + @property + def single_sided(self): + return self.obj.single_sided + + +class EmptyProtoArea: + def __init__(self, copper_fill=False): + self.copper_fill = copper_fill + + def fit_size(self, w, h, unit=MM): + return w, h + + def generate(self, bbox, border_text, unit=MM): + if self.copper_fill: + (min_x, min_y), (max_x, max_y) = bbox + group = ObjectGroup(0, 0, top_copper=[Region([(min_x, min_y), (max_x, min_y), (max_x, max_y), (min_x, max_y)], + unit=unit, polarity_dark=True)]) + group.bounding_box = lambda *args, **kwargs: None + yield group + + @property + def single_sided(self): + return True + + +class ManhattanPads(ObjectGroup): + def __init__(self, w, h=None, gap=0.2, unit=MM): + super().__init__(0, 0) + h = h or w + self.gap = gap + self.unit = unit + + p = (w-2*gap)/2 + q = (h-2*gap)/2 + small_ap = RectangleAperture(p, q, unit=unit) + + s = min(w, h) / 2 / math.sqrt(2) + large_ap = RectangleAperture(s, s, unit=unit).rotated(math.pi/4) + large_ap_neg = RectangleAperture(s+2*gap, s+2*gap, unit=unit).rotated(math.pi/4) + + a = gap/2 + p/2 + b = gap/2 + q/2 + + self.top_copper.append(Flash(-a, -b, aperture=small_ap, unit=unit)) + self.top_copper.append(Flash(-a, b, aperture=small_ap, unit=unit)) + self.top_copper.append(Flash( a, -b, aperture=small_ap, unit=unit)) + self.top_copper.append(Flash( a, b, aperture=small_ap, unit=unit)) + self.top_copper.append(Flash(0, 0, aperture=large_ap_neg, polarity_dark=False, unit=unit)) + self.top_copper.append(Flash(0, 0, aperture=large_ap, unit=unit)) + self.top_mask = self.top_copper + + +class RFGroundProto(ObjectGroup): + def __init__(self, pitch=None, drill=None, clearance=None, via_dia=None, via_drill=None, pad_dia=None, trace_width=None, unit=MM): + super().__init__(0, 0) + self.unit = unit + self.pitch = pitch = pitch or unit(2.54, MM) + self.drill = drill = drill or unit(0.9, MM) + self.clearance = clearance = clearance or unit(0.3, MM) + self.via_drill = via_drill = via_drill or unit(0.4, MM) + self.via_dia = via_dia = via_dia or unit(0.8, MM) + + if pad_dia is None: + self.trace_width = trace_width = trace_width or unit(0.3, MM) + pad_dia = pitch - trace_width - 2*clearance + elif trace_width is None: + trace_width = pitch - pad_dia - 2*clearance + self.pad_dia = pad_dia + + via_ap = RectangleAperture(via_dia, via_dia, unit=unit).rotated(math.pi/4) + pad_ap = CircleAperture(pad_dia, unit=unit) + pad_neg_ap = CircleAperture(pad_dia+2*clearance, unit=unit) + ground_ap = RectangleAperture(pitch + unit(0.01, MM), pitch + unit(0.01, MM), unit=unit) + pad_drill = ExcellonTool(drill, plated=True, unit=unit) + via_drill = ExcellonTool(via_drill, plated=True, unit=unit) + + self.top_copper.append(Flash(0, 0, aperture=ground_ap, unit=unit)) + self.top_copper.append(Flash(0, 0, aperture=pad_neg_ap, polarity_dark=False, unit=unit)) + self.top_copper.append(Flash(0, 0, aperture=pad_ap, unit=unit)) + self.top_mask.append(Flash(0, 0, aperture=pad_ap, unit=unit)) + self.top_copper.append(Flash(pitch/2, pitch/2, aperture=via_ap, unit=unit)) + self.top_mask.append(Flash(pitch/2, pitch/2, aperture=via_ap, unit=unit)) + self.drill_pth.append(Flash(0, 0, aperture=pad_drill, unit=unit)) + self.drill_pth.append(Flash(pitch/2, pitch/2, aperture=via_drill, unit=unit)) + + self.bottom_copper = self.top_copper + self.bottom_mask = self.top_mask + + def inst(self, x, y, border_x, border_y): + inst = copy(self) + if border_x or border_y: + inst.drill_pth = inst.drill_pth[:-1] + inst.top_copper = inst.bottom_copper = inst.top_copper[:-1] + inst.top_mask = inst.bottom_mask = inst.top_mask[:-1] + return inst + + +class THTFlowerProto(ObjectGroup): + def __init__(self, pitch=None, drill=None, diameter=None, unit=MM): + super().__init__(0, 0, unit=unit) + self.pitch = pitch = pitch or unit(2.54, MM) + drill = drill or unit(0.9, MM) + diameter = diameter or unit(2.0, MM) + + p = pitch / 2 + self.objects.append(THTPad.circle(-p, 0, drill, diameter, paste=False, unit=unit)) + self.objects.append(THTPad.circle( p, 0, drill, diameter, paste=False, unit=unit)) + self.objects.append(THTPad.circle(0, -p, drill, diameter, paste=False, unit=unit)) + self.objects.append(THTPad.circle(0, p, drill, diameter, paste=False, unit=unit)) + + middle_ap = CircleAperture(diameter, unit=unit) + self.top_copper.append(Flash(0, 0, aperture=middle_ap, unit=unit)) + self.bottom_copper = self.top_mask = self.bottom_mask = self.top_copper + + def inst(self, x, y, border_x, border_y): + if (x % 2 == 0) and (y % 2 == 0): + return copy(self) + + if (x % 2 == 1) and (y % 2 == 1): + return copy(self) + + return None + + def bounding_box(self, unit=MM): + x, y, rotation = self.abs_pos + p = self.pitch/2 + return unit.convert_bounds_from(self.unit, ((x-p, y-p), (x+p, y+p))) + +class PoweredProto(ObjectGroup): + """ Cell primitive for "powered" THT breadboards. This cell type is based on regular THT pads in a 100 mil grid, but + adds small SMD pads diagonally between the THT pads. These SMD pads are interconnected with traces and vias in such + a way that every second one is inter-linked, forming two fully connected grids. Next to every THT pad you have one + pad of each grid, so this layout is awesome for distributing power throughout the board. + + This design is based on one that Yajima Manufacturing Akizuki Denshi, Akihabara's finest electronics store sells for + next to nothing. Sadly, they don't ship internationally and they don't even have an English website, but if you ever + are in Akihabara, Tokyo, Japan I can *highly* recommend a visit. The ones Yajima make are better than what this will + produce since the Yajima ones use a two-colored silkscreen to visually distinguish the two power pad grids. + + Links: + Akizuki Denshi product page: https://akizukidenshi.com/catalog/g/gP-07214/ + Yajima Manufacturing Corporation website: http://www.yajima-works.co.jp/index.html + """ + + def __init__(self, pitch=None, drill=None, clearance=None, power_pad_dia=None, via_size=None, trace_width=None, unit=MM): + super().__init__(0, 0) + self.unit = unit + self.pitch = pitch = pitch or unit(2.54, MM) + self.drill = drill = drill or unit(0.9, MM) + self.clearance = clearance = clearance or unit(0.3, MM) + self.trace_width = trace_width = trace_width or unit(0.3, MM) + self.via_size = via_size = via_size or unit(0.4, MM) + + main_pad_dia = pitch - trace_width - 2*clearance + power_pad_dia_max = math.sqrt(2)*pitch - main_pad_dia - 2*clearance + if power_pad_dia is None: + power_pad_dia = power_pad_dia_max - clearance # reduce some more to give the user more room + elif power_pad_dia > power_pad_dia_max: + warnings.warn(f'Power pad diameter {power_pad_dia} > {power_pad_dia_max} violates pad-to-pad clearance') + self.power_pad_dia = power_pad_dia + + main_ap = CircleAperture(main_pad_dia, unit=unit) + power_ap = CircleAperture(self.power_pad_dia, unit=unit) + + for l in [self.top_copper, self.bottom_copper]: + l.append(Flash(0, 0, aperture=main_ap, unit=unit)) + + l.append(Flash(-pitch/2, -pitch/2, aperture=power_ap, unit=unit)) + l.append(Flash(-pitch/2, pitch/2, aperture=power_ap, unit=unit)) + l.append(Flash( pitch/2, -pitch/2, aperture=power_ap, unit=unit)) + l.append(Flash( pitch/2, pitch/2, aperture=power_ap, unit=unit)) + + self.drill_pth.append(Flash(0, 0, ExcellonTool(drill, plated=True, unit=unit), unit=unit)) + self.drill_pth.append(Flash(-pitch/2, -pitch/2, ExcellonTool(via_size, plated=True, unit=unit), unit=unit)) + + self.top_mask = copy(self.top_copper) + self.bottom_mask = copy(self.bottom_copper) + + self.line_ap = CircleAperture(trace_width, unit=unit) + self.top_copper.append(Line(-pitch/2, -pitch/2, -pitch/2, pitch/2, aperture=self.line_ap, unit=unit)) + self.top_copper.append(Line(pitch/2, -pitch/2, pitch/2, pitch/2, aperture=self.line_ap, unit=unit)) + self.bottom_copper.append(Line(-pitch/2, -pitch/2, pitch/2, -pitch/2, aperture=self.line_ap, unit=unit)) + self.bottom_copper.append(Line(-pitch/2, pitch/2, pitch/2, pitch/2, aperture=self.line_ap, unit=unit)) + + def inst(self, x, y, border_x, border_y): + inst = copy(self) + if (x + y) % 2 == 0: + inst.drill_pth = inst.drill_pth[:-1] + + c = self.power_pad_dia/2 + self.clearance + p = self.pitch/2 + + if x == 1: + inst.top_silk = [Line(-p, -p+c, -p, p-c, aperture=self.line_ap, unit=self.unit)] + elif x % 2 == 0: + inst.top_silk = [Line(p, -p+c, p, p-c, aperture=self.line_ap, unit=self.unit)] + + if y == 0: + inst.bottom_silk = [Line(-p+c, -p, p-c, -p, aperture=self.line_ap, unit=self.unit)] + elif y % 2 == 1: + inst.bottom_silk = [Line(-p+c, p, p-c, p, aperture=self.line_ap, unit=self.unit)] + + return inst + + def bounding_box(self, unit=MM): + x, y, rotation = self.abs_pos + p = self.pitch/2 + return unit.convert_bounds_from(self.unit, ((x-p, y-p), (x+p, y+p))) + + +class SpikyProto(ObjectGroup): + """ Cell primitive for the "spiky" protoboard designed by @electroniceel and published on github at the URL below. + This layout has small-ish standard THT pads, but in between these pads it puts a grid of SMD pads that are designed + for easy solder bridging to allow for the construction of traces from solder bridging. + + Github URL: https://github.com/electroniceel/protoboard + """ + + def __init__(self, pitch=None, drill=None, clearance=None, power_pad_dia=None, via_size=None, trace_width=None, unit=MM): + super().__init__(0, 0, unit=unit) + res = importlib.resources.files(package_data) + + self.fp_center = kfp.Footprint.load(res.joinpath('center-pad-spikes.kicad_mod').read_text(encoding='utf-8')) + self.corner_pad = kfp.FootprintInstance(1.27, 1.27, self.fp_center, unit=MM) + + self.pad = kfp.Footprint.load(res.joinpath('tht-0.8.kicad_mod').read_text(encoding='utf-8')) + self.center_pad = kfp.FootprintInstance(0, 0, self.pad, unit=MM) + + self.fp_between = kfp.Footprint.load(res.joinpath('pad-between-spiked.kicad_mod').read_text(encoding='utf-8')) + self.right_pad = kfp.FootprintInstance(1.27, 0, self.fp_between, unit=MM) + self.top_pad = kfp.FootprintInstance(0, 1.27, self.fp_between, rotation=math.pi/2, unit=MM) + + @property + def objects(self): + return [x for x in (self.center_pad, self.corner_pad, self.right_pad, self.top_pad) if x is not None] + + @objects.setter + def objects(self, value): + pass + + def inst(self, x, y, border_x, border_y): + inst = copy(self) + + if border_x: + inst.corner_pad = inst.right_pad = None + + if border_y: + inst.corner_pad = inst.top_pad = None + + return inst + + +class AlioCell(ObjectGroup): + """ Cell primitive for the ALio protoboard designed by arief ibrahim adha and published on hackaday.io at the URL + below. Similar to electroniceel's spiky protoboard, this layout has small-ish standard THT pads, but in between + these pads it puts a grid of SMD pads that are designed for easy solder bridging to allow for the construction of + traces from solder bridging. + + Hackaday.io URL: https://hackaday.io/project/28570/ + """ + + def __init__(self, pitch=None, drill=None, clearance=None, link_pad_width=None, link_trace_width=None, via_size=None, unit=MM): + super().__init__(0, 0, unit=unit) + self.pitch = pitch or unit(2.54, MM) + self.drill = drill or unit(0.9, MM) + self.clearance = clearance or unit(0.3, MM) + self.link_pad_width = link_pad_width or unit(1.1, MM) + self.link_trace_width = link_trace_width or unit(0.5, MM) + self.via_size = via_size or unit(0.4, MM) + self.border_x, self.border_y = False, False + self.inst_x, self.inst_y = None, None + + @property + def single_sided(self): + return False + + def inst(self, x, y, border_x, border_y): + inst = copy(self) + inst.border_x, inst.border_y = border_x, border_y + inst.inst_x, inst.inst_y = x, y + return inst + + def bounding_box(self, unit): + x, y, rotation = self.abs_pos + # FIXME hack + return self.unit.convert_bounds_to(unit, ((x-self.pitch/2, y-self.pitch/2), (x+self.pitch/2, y+self.pitch/2))) + + def render(self, layer_stack, cache=None): + x, y, rotation = self.abs_pos + def xf(fe): + fe = copy(fe) + fe.rotate(rotation) + fe.offset(x, y, self.unit) + return fe + + var = VariableExpression + # parameters: [1: total height = pad width, 2: pitch, 3: trace width, 4: corner radius, 5: rotation, 6: clearance] + alio_main_macro = ApertureMacro('ALIOM', ( + amp.CenterLine(MM, 1, var(2)-var(6), var(2)-var(3)-2*var(6), 0, 0, var(5)), + amp.Outline(MM, 0, 5, ( + -var(2)/2, -var(2)/2, + -var(2)/2, -(var(7)-var(8)), + -var(7), -(var(7)-var(8)), + -(var(7)-var(8)), -var(7), + -(var(7)-var(8)), -var(2)/2, + -var(2)/2, -var(2)/2, + ), var(5)), + amp.Outline(MM, 0, 5, ( + -var(2)/2, var(2)/2, + -var(2)/2, (var(7)-var(8)), + -var(7), (var(7)-var(8)), + -(var(7)-var(8)), var(7), + -(var(7)-var(8)), var(2)/2, + -var(2)/2, var(2)/2, + ), var(5)), + amp.Outline(MM, 0, 5, ( + var(2)/2, -var(2)/2, + var(2)/2, -(var(7)-var(8)), + var(7), -(var(7)-var(8)), + (var(7)-var(8)), -var(7), + (var(7)-var(8)), -var(2)/2, + var(2)/2, -var(2)/2, + ), var(5)), + amp.Outline(MM, 0, 5, ( + var(2)/2, var(2)/2, + var(2)/2, (var(7)-var(8)), + var(7), (var(7)-var(8)), + (var(7)-var(8)), var(7), + (var(7)-var(8)), var(2)/2, + var(2)/2, var(2)/2, + ), var(5)), + amp.Circle(MM, 0, 2*var(8), -var(7), -var(7), var(5)), + amp.Circle(MM, 0, 2*var(8), -var(7), var(7), var(5)), + amp.Circle(MM, 0, 2*var(8), var(7), -var(7), var(5)), + amp.Circle(MM, 0, 2*var(8), var(7), var(7), var(5)), + ), ( + None, # 1 + None, # 2 + None, # 3 + None, # 4 + None, # 5 + None, # 6 + var(2)/2 - var(1)/2 + var(4), # 7 + var(4)+var(6), # 8 + )) + corner_radius = (self.link_pad_width - self.link_trace_width)/3 + main_ap = ApertureMacroInstance(alio_main_macro, (self.link_pad_width, # 1 + self.pitch, # 2 + self.link_trace_width, # 3 + corner_radius, # 4 + rotation, # 5 + self.clearance), unit=MM) # 6 + main_ap_90 = ApertureMacroInstance(alio_main_macro, (self.link_pad_width, # 1 + self.pitch, # 2 + self.link_trace_width, # 3 + corner_radius, # 4 + rotation-90, # 5 + self.clearance), unit=MM) # 6 + main_drill = ExcellonTool(self.drill, plated=True, unit=self.unit) + via_drill = ExcellonTool(self.via_size, plated=True, unit=self.unit) + + # parameters: [1: total height = pad width, 2: total width, 3: trace width, 4: corner radius, 5: rotation] + alio_macro = ApertureMacro('ALIOP', ( + amp.CenterLine(MM, 1, var(1)-2*var(4), var(1), 0, 0, var(5)), + amp.CenterLine(MM, 1, var(1), var(1)-2*var(4), 0, 0, var(5)), + amp.Circle(MM, 1, 2*var(4), -var(1)/2+var(4), -var(1)/2+var(4), var(5)), + amp.Circle(MM, 1, 2*var(4), -var(1)/2+var(4), var(1)/2-var(4), var(5)), + amp.Circle(MM, 1, 2*var(4), var(1)/2-var(4), -var(1)/2+var(4), var(5)), + amp.Circle(MM, 1, 2*var(4), var(1)/2-var(4), var(1)/2-var(4), var(5)), + amp.CenterLine(MM, 1, var(2), var(3), -var(2)/2 + var(1)/2, 0, var(5)), + )) + alio_dark = ApertureMacroInstance(alio_macro, (self.link_pad_width, # 1 + self.pitch-self.clearance, # 2 + self.link_trace_width, # 3 + corner_radius, # 4 + rotation), unit=MM) # 5 + alio_dark_90 = ApertureMacroInstance(alio_macro, (self.link_pad_width, # 1 + self.pitch-self.clearance, # 2 + self.link_trace_width, # 3 + corner_radius, # 4 + rotation+90), unit=MM) # 5 + + # all layers are identical here + for side, use in (('top', 'copper'), ('top', 'mask'), ('bottom', 'copper'), ('bottom', 'mask')): + if side == 'top': + layer_stack[side, use].objects.insert(0, xf(Flash(0, 0, aperture=main_ap, unit=self.unit))) + if not self.border_y: + layer_stack[side, use].objects.append(xf(Flash(self.pitch/2, self.pitch/2, aperture=alio_dark, unit=self.unit))) + else: + layer_stack[side, use].objects.insert(0, xf(Flash(0, 0, aperture=main_ap_90, unit=self.unit))) + if not self.border_x: + layer_stack[side, use].objects.append(xf(Flash(self.pitch/2, self.pitch/2, aperture=alio_dark_90, unit=self.unit))) + + layer_stack.drill_pth.append(Flash(x, y, aperture=main_drill, unit=self.unit)) + if not (self.border_x or self.border_y): + layer_stack.drill_pth.append(xf(Flash(self.pitch/2, self.pitch/2, aperture=via_drill, unit=self.unit))) + + +def convert_to_mm(value, unit): + unitl = unit.lower() + if unitl == 'mm': + return value + elif unitl == 'cm': + return value*10 + elif unitl == 'in': + return value*25.4 + elif unitl == 'mil': + return value/1000*25.4 + else: + raise ValueError(f'Invalid unit {unit}, allowed units are mm, cm, in, and mil.') + + +_VALUE_RE = re.compile('([0-9]*\.?[0-9]+)(cm|mm|in|mil|%)') +def eval_value(value, total_length=None): + if not isinstance(value, str): + return None + + m = _VALUE_RE.match(value.lower()) + number, unit = m.groups() + if unit == '%': + if total_length is None: + raise ValueError('Percentages are not allowed for this value') + return total_length * float(number) / 100 + return convert_to_mm(float(number), unit) + + +def _demo(): + #pattern1 = PatternProtoArea(2.54, obj=THTPad.circle(0, 0, 0.9, 1.8, paste=False)) + #pattern1 = PatternProtoArea(2.54, 2.54, obj=SpikyProto()) + #pattern2 = PatternProtoArea(1.2, 2.0, obj=SMDPad.rect(0, 0, 1.0, 1.8, paste=False)) + #pattern3 = PatternProtoArea(2.54, 1.27, obj=SMDPad.rect(0, 0, 2.3, 1.0, paste=False)) + #pattern3 = EmptyProtoArea(copper_fill=True) + #stack = TwoSideLayout(pattern2, pattern3) + #pattern2 = PatternProtoArea(2.54, obj=PoweredProto(), margin=1) + #pattern3 = PatternProtoArea(2.54, obj=RFGroundProto()) + #stack = PropLayout([pattern2, pattern3], 'h', [0.5, 0.5]) + #pattern = PropLayout([pattern1, stack], 'h', [0.5, 0.5]) + #pattern = PatternProtoArea(2.54, obj=ManhattanPads(2.54)) + #pattern = PatternProtoArea(2.54*1.5, obj=THTFlowerProto()) + #pattern = PatternProtoArea(2.54, obj=THTPad.circle(0, 0, 0.9, 1.8, paste=False)) + #pattern = PatternProtoArea(2.54, obj=PoweredProto()) + pattern = PatternProtoArea(2.54, obj=AlioCell(), margin=2) + pb = ProtoBoard(50, 47, pattern, mounting_hole_dia=3.2, mounting_hole_offset=5) + #pb = ProtoBoard(10, 10, pattern1) + print(pb.pretty_svg()) + pb.layer_stack().save_to_directory('/tmp/testdir') + + +if __name__ == '__main__': + _demo() + #cnt = alphabetic()() + #for _ in range(32): + # for _ in range(26): + # print(f'{next(cnt):>2}', end=' ', file=sys.stderr) + # print(file=sys.stderr) + diff --git a/src/gerbonara/cad/protoserve.py b/gerbonara/cad/protoserve.py similarity index 74% rename from src/gerbonara/cad/protoserve.py rename to gerbonara/cad/protoserve.py index 994bc20..25ef8c6 100644 --- a/src/gerbonara/cad/protoserve.py +++ b/gerbonara/cad/protoserve.py @@ -8,7 +8,6 @@ from quart import Quart, request, Response, send_file, abort from . import protoboard as pb from . import protoserve_data -from .primitives import SMDStack from ..utils import MM, Inch @@ -26,7 +25,7 @@ def extract_importlib(package): else: assert item.is_dir() item_out.mkdir() - stack.append((item, item_out)) + stack.push((item, item_out)) return root @@ -63,10 +62,10 @@ def deserialize(obj, unit): case 'smd': match obj['pad_shape']: case 'rect': - stack = SMDStack.rect(pitch_x-clearance, pitch_y-clearance, paste=False, unit=unit) + pad = pb.SMDPad.rect(0, 0, pitch_x-clearance, pitch_y-clearance, paste=False, unit=unit) case 'circle': - stack = SMDStack.circle(min(pitch_x, pitch_y)-clearance, paste=False, unit=unit) - return pb.PatternProtoArea(pitch_x, pitch_y, obj=stack, unit=unit) + pad = pb.SMDPad.circle(0, 0, min(pitch_x, pitch_y)-clearance, paste=False, unit=unit) + return pb.PatternProtoArea(pitch_x, pitch_y, obj=pad, unit=unit) case 'tht': hole_dia = mil(float(obj['hole_dia'])) @@ -80,11 +79,11 @@ def deserialize(obj, unit): match obj['pad_shape']: case 'rect': - pad = pb.THTPad.rect(hole_dia, pitch_x-clearance, pitch_y-clearance, paste=False, plated=plated, unit=unit) + pad = pb.THTPad.rect(0, 0, hole_dia, pitch_x-clearance, pitch_y-clearance, paste=False, plated=plated, unit=unit) case 'circle': - pad = pb.THTPad.circle(hole_dia, min(pitch_x, pitch_y)-clearance, paste=False, plated=plated, unit=unit) + pad = pb.THTPad.circle(0, 0, hole_dia, min(pitch_x, pitch_y)-clearance, paste=False, plated=plated, unit=unit) case 'obround': - pad = pb.THTPad.obround(hole_dia, pitch_x-clearance, pitch_y-clearance, paste=False, plated=plated, unit=unit) + pad = pb.THTPad.obround(0, 0, hole_dia, pitch_x-clearance, pitch_y-clearance, paste=False, plated=plated, unit=unit) if oneside: pad.pad_bottom = None @@ -107,8 +106,7 @@ def deserialize(obj, unit): pitch = mil(float(obj.get('pitch', 2.54))) hole_dia = mil(float(obj['hole_dia'])) pattern_dia = mil(float(obj['pattern_dia'])) - clearance = mil(float(obj['clearance'])) - return pb.PatternProtoArea(pitch, pitch, pb.THTFlowerProto(pitch, hole_dia, pattern_dia, clearance, unit=unit), unit=unit) + return pb.PatternProtoArea(2*pitch, 2*pitch, pb.THTFlowerProto(pitch, hole_dia, pattern_dia, unit=unit), unit=unit) case 'spiky': return pb.PatternProtoArea(2.54, 2.54, pb.SpikyProto(), unit=unit) @@ -129,20 +127,6 @@ def deserialize(obj, unit): via_size=via_size ), margin=unit(1.5, MM), unit=unit) - case 'breadboard': - horizontal = obj.get('direction', 'v') == 'h' - drill = float(obj.get('hole_dia', 0.9)) - return pb.BreadboardArea(clearance=clearance, drill=drill, horizontal=horizontal, unit=unit) - - case 'starburst': - trace_width_x = float(obj.get('trace_width_x', 1.8)) - trace_width_y = float(obj.get('trace_width_y', 1.8)) - drill = float(obj.get('hole_dia', 0.9)) - annular_ring = float(obj.get('annular', 1.2)) - clearance = float(obj.get('clearance', 0.4)) - mask_width = float(obj.get('mask_width', 0.5)) - return pb.PatternProtoArea(pitch_x, pitch_y, pb.StarburstPad(pitch_x, pitch_y, trace_width_x, trace_width_y, clearance, mask_width, drill, annular_ring, unit=unit), unit=unit) - case 'rf': pitch = float(obj.get('pitch', 2.54)) hole_dia = float(obj['hole_dia']) @@ -155,7 +139,6 @@ def to_board(obj): w = float(obj.get('width', unit(100, MM))) h = float(obj.get('height', unit(80, MM))) corner_radius = float(obj.get('round_corners', {}).get('radius', unit(1.5, MM))) - margin = float(obj.get('margin', unit(2.0, MM))) holes = obj.get('mounting_holes', {}) mounting_hole_dia = float(holes.get('diameter', unit(3.2, MM))) mounting_hole_offset = float(holes.get('offset', unit(5, MM))) @@ -172,14 +155,13 @@ def to_board(obj): corner_radius=corner_radius, mounting_hole_dia=mounting_hole_dia, mounting_hole_offset=mounting_hole_offset, - margin=margin, unit=unit) -@app.route('/preview_.svg', methods=['POST']) -async def preview(side): +@app.route('/preview.svg', methods=['POST']) +async def preview(): obj = await request.get_json() board = to_board(obj) - return Response(str(board.pretty_svg(side=side)), mimetype='image/svg+xml') + return Response(str(board.pretty_svg()), mimetype='image/svg+xml') @app.route('/gerbers.zip', methods=['POST']) async def gerbers(): @@ -190,10 +172,7 @@ async def gerbers(): board.layer_stack().save_to_zipfile(f) return Response(f.read_bytes(), mimetype='image/svg+xml') -def main(): - app.run() - if __name__ == '__main__': - main() + app.run() diff --git a/src/gerbonara/cad/protoserve_data/protoserve.html b/gerbonara/cad/protoserve_data/protoserve.html similarity index 87% rename from src/gerbonara/cad/protoserve_data/protoserve.html rename to gerbonara/cad/protoserve_data/protoserve.html index 4da027a..c42ce6c 100644 --- a/src/gerbonara/cad/protoserve_data/protoserve.html +++ b/gerbonara/cad/protoserve_data/protoserve.html @@ -177,14 +177,11 @@ input[type="text"]:focus:valid { position: relative; grid-area: main; padding: 20px; - display: flex; - flex-direction: column; - flex-wrap: wrap; - align-items: stretch; } -#preview > img { - flex-grow: 1; +#preview-image { + width: 100%; + height: 100%; object-fit: contain; } @@ -283,12 +280,6 @@ input[type="text"]:focus:valid { inch - -
- Automatically generated top side preview image - Automatically generated bottom side preview image + Automatically generated preview image
@@ -480,7 +468,7 @@ input[type="text"]:focus:valid { mil