Fix lineWidth reset in rendering, update compatibility with nightly

Fixes #531

Author: qu1ck

DATAFORMAT.md

@@ -260,6 +260,7 @@ attribute.
   "justify": [horizontal, vertical],
   // Either the thickness or the fillrule must be used
   "thickness": thickness,
+  // fillrule is only supported for svgpath
   "fillrule": "nonzero" | "evenodd",
   "attr": [
     // may include none, one or both

InteractiveHtmlBom/ecad/kicad.py

@@ -31,9 +31,11 @@ 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())  # type: list[pcbnew.MODULE]
+            # type: list[pcbnew.MODULE]
+            self.footprints = list(self.board.GetModules())
         else:
-            self.footprints = list(self.board.GetFootprints())  # type: list[pcbnew.FOOTPRINT]
+            # type: list[pcbnew.FOOTPRINT]
+            self.footprints = list(self.board.GetFootprints())
         self.font_parser = FontParser()
 
     def get_extra_field_data(self, file_name):
@@ -273,7 +275,8 @@ def parse_text(self, d):
                 "svgpath": create_path(lines)
             }
         elif hasattr(d, 'GetEffectiveTextShape'):
-            shape = d.GetEffectiveTextShape(False)  # type: pcbnew.SHAPE_COMPOUND
+            # type: pcbnew.SHAPE_COMPOUND
+            shape = d.GetEffectiveTextShape(False)
             segments = []
             polygons = []
             for s in shape.GetSubshapes():
@@ -426,7 +429,7 @@ def get_all_drawings(self):
             for d in f.GraphicalItems():
                 drawings.append((d.GetClass(), d))
             if hasattr(f, "GetFields"):
-                fields = f.GetFields() # type: list[pcbnew.PCB_FIELD]
+                fields = f.GetFields()  # type: list[pcbnew.PCB_FIELD]
                 for field in fields:
                     if field.IsReference() or field.IsValue():
                         continue
@@ -450,11 +453,15 @@ def parse_pad(self, pad):
         custom_padstack = False
         outer_layers = [(pcbnew.F_Cu, "F"), (pcbnew.B_Cu, "B")]
         if hasattr(pad, 'Padstack'):
-            padstack = pad.Padstack() # type: pcbnew.PADSTACK
+            padstack = pad.Padstack()  # type: pcbnew.PADSTACK
             layers_set = list(padstack.LayerSet().Seq())
+            if hasattr(pcbnew, "UNCONNECTED_LAYER_MODE_REMOVE_ALL"):
+                ULMRA = pcbnew.UNCONNECTED_LAYER_MODE_REMOVE_ALL
+            else:
+                ULMRA = padstack.UNCONNECTED_LAYER_MODE_REMOVE_ALL
             custom_padstack = (
-                padstack.Mode() != padstack.MODE_NORMAL or \
-                    padstack.UnconnectedLayerMode() == padstack.UNCONNECTED_LAYER_MODE_REMOVE_ALL
+                padstack.Mode() != padstack.MODE_NORMAL or
+                padstack.UnconnectedLayerMode() == ULMRA
             )
         else:
             layers_set = list(pad.GetLayerSet().Seq())

InteractiveHtmlBom/web/render.js

@@ -28,15 +28,13 @@ function drawText(ctx, text, color) {
     if ("thickness" in text) {
       ctx.lineWidth = text.thickness;
       ctx.stroke(new Path2D(text.svgpath));
-      ctx.restore();
-      return;
-    }
-    if ("fillrule" in text) {
+    } else if ("fillrule" in text) {
       ctx.fill(new Path2D(text.svgpath), text.fillrule);
-      ctx.restore();
-      return;
     }
+    ctx.restore();
+    return;
   }
+  ctx.lineWidth = text.thickness;
   if ("polygons" in text) {
     ctx.fill(getPolygonsPath(text));
     ctx.restore();