Use kicad's own text rendering when possible

Transform kicad text objects into segments list using native rendering
method and then build an svgpath from it for the web renderer.

Fixes #198

Author: qu1ck

InteractiveHtmlBom/ecad/kicad.py

@@ -5,6 +5,7 @@
 
 from .common import EcadParser, Component
 from .kicad_extra import find_latest_schematic_data, parse_schematic_data
+from .svgpath import create_path
 from ..core import ibom
 from ..core.config import Config
 from ..core.fontparser import FontParser
@@ -134,6 +135,21 @@ def parse_text(self, d):
         pos = self.normalize(d.GetPosition())
         if not d.IsVisible():
             return None
+        if hasattr(d, "GetTextThickness"):
+            thickness = d.GetTextThickness() * 1e-6
+        else:
+            thickness = d.GetThickness() * 1e-6
+        if hasattr(d, 'TransformToSegmentList'):
+            segments = [self.normalize(p) for p in d.TransformToSegmentList()]
+            lines = []
+            for i in range(0, len(segments), 2):
+                if i == 0 or segments[i-1] != segments[i]:
+                    lines.append([segments[i]])
+                lines[-1].append(segments[i+1])
+            return {
+                "thickness": thickness,
+                "svgpath": create_path(lines)
+            }
         if d.GetClass() == "MTEXT":
             angle = d.GetDrawRotation() * 0.1
         else:
@@ -147,10 +163,6 @@ def parse_text(self, d):
         else:
             height = d.GetHeight() * 1e-6
             width = d.GetWidth() * 1e-6
-        if hasattr(d, "GetTextThickness"):
-            thickness = d.GetTextThickness() * 1e-6
-        else:
-            thickness = d.GetThickness() * 1e-6
         if hasattr(d, "GetShownText"):
             text = d.GetShownText()
         else:
@@ -163,6 +175,7 @@ def parse_text(self, d):
             attributes.append("italic")
         if d.IsBold():
             attributes.append("bold")
+
         return {
             "pos": pos,
             "text": text,
@@ -188,8 +201,8 @@ def parse_edges(self, pcb):
         edges = []
         drawings = list(pcb.GetDrawings())
         bbox = None
-        for m in self.footprints:
-            for g in m.GraphicalItems():
+        for f in self.footprints:
+            for g in f.GraphicalItems():
                 drawings.append(g)
         for d in drawings:
             if d.GetLayer() == pcbnew.Edge_Cuts:
@@ -228,10 +241,10 @@ def parse_drawings_on_layers(self, drawings, f_layer, b_layer):
 
     def get_all_drawings(self):
         drawings = [(d.GetClass(), d) for d in list(self.board.GetDrawings())]
-        for m in self.footprints:
-            drawings.append(("ref", m.Reference()))
-            drawings.append(("val", m.Value()))
-            for d in m.GraphicalItems():
+        for f in self.footprints:
+            drawings.append(("ref", f.Reference()))
+            drawings.append(("val", f.Value()))
+            for d in f.GraphicalItems():
                 drawings.append((d.GetClass(), d))
         return drawings
 

InteractiveHtmlBom/ecad/svgpath.py

@@ -507,3 +507,15 @@ def parse_path(pathdef, logger, current_pos=0j):
             current_pos = end
 
     return segments
+
+
+def create_path(lines):
+    """Returns a path d-string."""
+
+    parts = []
+    for line in lines:
+        parts.append('M{},{}'.format(line[0][0], line[0][1]))
+        for point in line[1:]:
+            parts.append('L{},{}'.format(point[0], point[1]))
+
+    return ''.join(parts)

InteractiveHtmlBom/web/render.js

@@ -16,7 +16,7 @@ function calcFontPoint(linepoint, text, offsetx, offsety, tilt) {
   return point;
 }
 
-function drawtext(ctx, text, color, flip) {
+function drawText(ctx, text, color) {
   if ("ref" in text && !settings.renderReferences) return;
   if ("val" in text && !settings.renderValues) return;
   ctx.save();
@@ -226,13 +226,13 @@ function drawPolygonShape(ctx, shape, color) {
   ctx.restore();
 }
 
-function drawDrawing(ctx, layer, scalefactor, drawing, color) {
+function drawDrawing(ctx, scalefactor, drawing, color) {
   if (["segment", "arc", "circle", "curve"].includes(drawing.type)) {
     drawedge(ctx, scalefactor, drawing, color);
   } else if (drawing.type == "polygon") {
     drawPolygonShape(ctx, drawing, color);
   } else {
-    drawtext(ctx, drawing, color, layer == "B");
+    drawText(ctx, drawing, color);
   }
 }
 
@@ -313,7 +313,7 @@ function drawFootprint(ctx, layer, scalefactor, footprint, padcolor, outlinecolo
   // draw drawings
   for (var drawing of footprint.drawings) {
     if (drawing.layer == layer) {
-      drawDrawing(ctx, layer, scalefactor, drawing.drawing, padcolor);
+      drawDrawing(ctx, scalefactor, drawing.drawing, padcolor);
     }
   }
   // draw pads
@@ -364,7 +364,7 @@ function drawBgLayer(layername, canvas, layer, scalefactor, edgeColor, polygonCo
     } else if (d.type == "polygon") {
       drawPolygonShape(ctx, d, polygonColor);
     } else {
-      drawtext(ctx, d, textColor, layer == "B");
+      drawText(ctx, d, textColor);
     }
   }
 }