Add Bezier curve support

Fixes #120
openscopeproject · Nov 14, 2019 · 8587d54 · 8587d54
1 parent d0bd8d5
commit 8587d54
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/InteractiveHtmlBom/ecad/kicad.py b/InteractiveHtmlBom/ecad/kicad.py
@@ -39,11 +39,13 @@ def normalize(point):
         return [point[0] * 1e-6, point[1] * 1e-6]
 
     def parse_draw_segment(self, d):
+        # type: (pcbnew.DRAWSEGMENT) -> dict | None
         shape = {
             pcbnew.S_SEGMENT: "segment",
             pcbnew.S_CIRCLE: "circle",
             pcbnew.S_ARC: "arc",
             pcbnew.S_POLYGON: "polygon",
+            pcbnew.S_CURVE: "curve",
         }.get(d.GetShape(), "")
         if shape == "":
             self.logger.info("Unsupported shape %s, skipping", d.GetShape())
@@ -93,6 +95,15 @@ def parse_draw_segment(self, d):
                 "angle": angle,
                 "polygons": polygons
             }
+        if shape == "curve":
+            return {
+                "type": shape,
+                "start": start,
+                "cpa": self.normalize(d.GetBezControl1()),
+                "cpb": self.normalize(d.GetBezControl2()),
+                "end": end,
+                "width": d.GetWidth() * 1e-6
+            }
 
     def parse_poly_set(self, polygon_set):
         result = []
@@ -373,7 +384,7 @@ def parse_tracks(self, tracks):
 
     def parse_zones(self, zones):
         result = {pcbnew.F_Cu: [], pcbnew.B_Cu: []}
-        for zone in zones: # type: (pcbnew.ZONE_CONTAINER)
+        for zone in zones:  # type: pcbnew.ZONE_CONTAINER
             if not zone.IsFilled() or zone.GetIsKeepout():
                 continue
             if zone.GetLayer() in [pcbnew.F_Cu, pcbnew.B_Cu]:

diff --git a/InteractiveHtmlBom/web/render.js b/InteractiveHtmlBom/web/render.js
@@ -103,32 +103,32 @@ function drawedge(ctx, scalefactor, edge, color) {
   ctx.strokeStyle = color;
   ctx.lineWidth = Math.max(1 / scalefactor, edge.width);
   ctx.lineCap = "round";
-  if (edge.type == "segment") {
-    ctx.beginPath();
-    ctx.moveTo(...edge.start);
-    ctx.lineTo(...edge.end);
-    ctx.stroke();
-  }
-  if (edge.type == "arc") {
+  if (edge.svgpath) {
+    ctx.stroke(new Path2D(edge.svgpath));
+  } else {
     ctx.beginPath();
-    if (edge.svgpath) {
-      ctx.stroke(new Path2D(edge.svgpath));
-    } else {
+    if (edge.type == "segment") {
+      ctx.moveTo(...edge.start);
+      ctx.lineTo(...edge.end);
+    }
+    if (edge.type == "arc") {
       ctx.arc(
         ...edge.start,
         edge.radius,
         deg2rad(edge.startangle),
         deg2rad(edge.endangle));
-      ctx.stroke();
     }
-  }
-  if (edge.type == "circle") {
-    ctx.beginPath();
-    ctx.arc(
-      ...edge.start,
-      edge.radius,
-      0, 2 * Math.PI);
-    ctx.closePath();
+    if (edge.type == "circle") {
+      ctx.arc(
+        ...edge.start,
+        edge.radius,
+        0, 2 * Math.PI);
+      ctx.closePath();
+    }
+    if (edge.type == "curve") {
+      ctx.moveTo(...edge.start);
+      ctx.bezierCurveTo(...edge.cpa, ...edge.cpb, ...edge.end);
+    }
     ctx.stroke();
   }
 }