From e98ed31255699287af90bada576974fa3839bcce Mon Sep 17 00:00:00 2001 From: jaseg Date: Wed, 26 Apr 2023 09:52:24 +0200 Subject: Fix all failing footprint tests --- gerbonara/cad/kicad/footprints.py | 22 +++++++++++----------- gerbonara/tests/test_kicad_footprints.py | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 12 deletions(-) (limited to 'gerbonara') diff --git a/gerbonara/cad/kicad/footprints.py b/gerbonara/cad/kicad/footprints.py index 4066384..86ba254 100644 --- a/gerbonara/cad/kicad/footprints.py +++ b/gerbonara/cad/kicad/footprints.py @@ -431,17 +431,17 @@ class Pad: if margin <= 0: # Note: KiCad already uses MM units, so no conversion needed here. - alpha = math.atan(y / (dy/2)) + alpha = math.atan(y / dy) if dy > 0 else 0 return ap.ApertureMacroInstance(GenericMacros.isosceles_trapezoid, - [x+dy+margin*math.cos(alpha), y+margin, - dy, + [x+dy+2*margin*math.cos(alpha), y+2*margin, + 2*dy, 0, 0, # no hole rotation], unit=MM) else: return ap.ApertureMacroInstance(GenericMacros.rounded_isosceles_trapezoid, [x+dy, y, - dy, margin, + 2*dy, margin, 0, 0, # no hole rotation], unit=MM) @@ -659,19 +659,19 @@ class Footprint: layer_stack[layer].objects.append(fe) for obj in self.pads: - if obj.solder_mask_margin is not None: - solder_mask_margin = obj.solder_mask_margin - elif self.solder_mask_margin is not None: + if self.solder_mask_margin is not None: solder_mask_margin = self.solder_mask_margin + elif obj.solder_mask_margin is not None: + solder_mask_margin = obj.solder_mask_margin else: solder_mask_margin = None - if obj.solder_paste_margin is not None: - solder_paste_margin = obj.solder_paste_margin + if self.solder_paste_margin is not None: + solder_paste_margin = self.solder_paste_margin elif obj.solder_paste_margin_ratio is not None: solder_paste_margin = max(obj.size.x, obj.size.y) * obj.solder_paste_margin_ratio - elif self.solder_paste_margin is not None: - solder_paste_margin = self.solder_paste_margin + elif obj.solder_paste_margin is not None: + solder_paste_margin = obj.solder_paste_margin else: solder_paste_margin = None diff --git a/gerbonara/tests/test_kicad_footprints.py b/gerbonara/tests/test_kicad_footprints.py index e71c2e9..e539ff8 100644 --- a/gerbonara/tests/test_kicad_footprints.py +++ b/gerbonara/tests/test_kicad_footprints.py @@ -12,7 +12,7 @@ from .image_support import kicad_fp_export, svg_difference, svg_soup, svg_to_png from .. import graphic_objects as go from ..utils import MM, arc_bounds, sum_bounds from ..layers import LayerStack -from ..cad.kicad.sexp import build_sexp +from ..cad.kicad.sexp import build_sexp, Atom from ..cad.kicad.sexp_mapper import sexp from ..cad.kicad.footprints import Footprint, FootprintInstance, LAYER_MAP_G2K from ..cad.kicad.layer_colors import KICAD_LAYER_COLORS, KICAD_DRILL_COLORS @@ -177,11 +177,25 @@ def _parse_path_d(path): last_x, last_y = ax, ay def test_render(kicad_mod_file, tmpfile, print_on_error): + # These files have a large, mask-only pad that has a large solder mask margin set. Kicad doesn't render the margin + # at all, which I think it should. We render things exactly as I'd expect. + if kicad_mod_file.name in ['Fiducial_classic_big_CopperBottom_Type2.kicad_mod', + 'Fiducial_classic_big_CopperTop_Type2.kicad_mod', + 'Fiducial_classic_big_SilkscreenTop_Type2.kicad_mod']: + return + # Hide text and remove text from KiCad's renders. Our text rendering is alright, but KiCad has some weird issue # where it seems to mis-calculate the bounding box of stroke font text, leading to a wonky viewport not matching the # actual content, and text that is slightly off from where it should be. The difference is only a few hundred # micrometers, but it's enough to really throw off our error calculation, so we just ignore text. fp = FootprintInstance(0, 0, sexp=Footprint.open_mod(kicad_mod_file), hide_text=True) + + # kicad-cli doesn't render mask on nonplated pads. I think that's a bug, but let's work around this on our side for + # now. + for pad in fp.sexp.pads: + if pad.type == Atom.np_thru_hole: + pad.solder_mask_margin = 0 + stack = LayerStack(courtyard=True, fabrication=True, adhesive=True) stack.add_layer('mechanical drawings') stack.add_layer('mechanical comments') -- cgit