Fix footprint fields handling for kicad 8

Fixes #447

Author: qu1ck

InteractiveHtmlBom/ecad/common.py

@@ -43,7 +43,6 @@ def remap(ref_fields):
         by_ref = {r: remap(d) for (r, d) in data.fields_by_ref.items()}
         if data.fields_by_index:
             by_index = {i: remap(d) for (i, d) in data.fields_by_index.items()}
-            print([a.get("blah", "") for a in by_index.values()])
         else:
             by_index = None
 

InteractiveHtmlBom/ecad/kicad.py

@@ -19,9 +19,9 @@ def __init__(self, file_name, config, logger, board=None):
         if self.board is None:
             self.board = pcbnew.LoadBoard(self.file_name)  # type: pcbnew.BOARD
         if hasattr(self.board, 'GetModules'):
-            self.footprints = list(self.board.GetModules())
+            self.footprints = list(self.board.GetModules())  # type: list[pcbnew.MODULE]
         else:
-            self.footprints = list(self.board.GetFootprints())
+            self.footprints = list(self.board.GetFootprints())  # type: list[pcbnew.FOOTPRINT]
         self.font_parser = FontParser()
 
     def get_extra_field_data(self, file_name):
@@ -109,7 +109,7 @@ def get_arc_angles(self, d):
         return round(a1, 2), round(a2, 2)
 
     def parse_shape(self, d):
-        # type: (pcbnew.PCB_SHAPE) -> dict or None
+        # type: (pcbnew.PCB_SHAPE) -> dict | None
         shape = {
             pcbnew.S_SEGMENT: "segment",
             pcbnew.S_CIRCLE: "circle",
@@ -413,10 +413,17 @@ def get_all_drawings(self):
             drawings.append(("val", f.Value()))
             for d in f.GraphicalItems():
                 drawings.append((d.GetClass(), d))
+            if hasattr(f, "GetFields"):
+                fields = f.GetFields() # type: list[pcbnew.PCB_FIELD]
+                for field in fields:
+                    if field.IsReference() or field.IsValue():
+                        continue
+                    drawings.append((field.GetClass(), field))
+
         return drawings
 
     def parse_pad(self, pad):
-        # type: (pcbnew.PAD) -> dict or None
+        # type: (pcbnew.PAD) -> dict | None
         layers_set = list(pad.GetLayerSet().Seq())
         layers = []
         if pcbnew.F_Cu in layers_set:
@@ -497,7 +504,7 @@ def parse_pad(self, pad):
     def parse_footprints(self):
         # type: () -> list
         footprints = []
-        for f in self.footprints:  # type: pcbnew.FOOTPRINT
+        for f in self.footprints:
             ref = f.GetReference()
 
             # bounding box
@@ -619,8 +626,9 @@ def parse_tracks(self, tracks):
         }
 
     def parse_zones(self, zones):
+        # type: (list[pcbnew.ZONE]) -> dict
         result = {pcbnew.F_Cu: [], pcbnew.B_Cu: []}
-        for zone in zones:  # type: pcbnew.ZONE
+        for zone in zones:
             if (not zone.IsFilled() or
                     hasattr(zone, 'GetIsKeepout') and zone.GetIsKeepout() or
                     hasattr(zone, 'GetIsRuleArea') and zone.GetIsRuleArea()):