circuit-to-svg 0.0.237 → 0.0.239

package/dist/index.d.ts

@@ -112,6 +112,8 @@ interface PinoutSvgContext {
     };
     styleScale: number;
     label_positions: Map<string, LabelPosition>;
+    svgWidth: number;
+    svgHeight: number;
 }
 declare function convertCircuitJsonToPinoutSvg(soup: AnyCircuitElement[], options?: Options$2): string;
 

package/dist/index.js

@@ -2346,8 +2346,18 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
   if (hole.hole_shape === "pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
-    const radiusX = scaledWidth / 2;
-    const straightLength = scaledHeight - scaledWidth;
+    const isHorizontal = scaledWidth > scaledHeight;
+    const radius = Math.min(scaledWidth, scaledHeight) / 2;
+    const straightLength = Math.abs(
+      isHorizontal ? scaledWidth - scaledHeight : scaledHeight - scaledWidth
+    );
+    const pathD = isHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${x - straightLength / 2},${y - radius} h${straightLength} a${radius},${radius} 0 0 1 0,${scaledHeight} h-${straightLength} a${radius},${radius} 0 0 1 0,-${scaledHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${x - radius},${y - straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
+    );
     return [
       {
         name: "path",
@@ -2355,7 +2365,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         attributes: {
           class: "pcb-hole",
           fill: colorMap2.drill,
-          d: `M${x - radiusX},${y - straightLength / 2} v${straightLength} a${radiusX},${radiusX} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radiusX},${radiusX} 0 0 0 -${scaledWidth},0 z`,
+          d: pathD,
           "data-type": "pcb_hole",
           "data-pcb-layer": "drill"
         },
@@ -2367,9 +2377,19 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
   if (hole.hole_shape === "rotated_pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
-    const radiusX = scaledWidth / 2;
-    const straightLength = scaledHeight - scaledWidth;
     const rotation = "ccw_rotation" in hole ? hole.ccw_rotation ?? 0 : 0;
+    const isHorizontal = scaledWidth > scaledHeight;
+    const radius = Math.min(scaledWidth, scaledHeight) / 2;
+    const straightLength = Math.abs(
+      isHorizontal ? scaledWidth - scaledHeight : scaledHeight - scaledWidth
+    );
+    const pathD = isHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${-straightLength / 2},${-radius} h${straightLength} a${radius},${radius} 0 0 1 0,${scaledHeight} h-${straightLength} a${radius},${radius} 0 0 1 0,-${scaledHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${-radius},${-straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
+    );
     return [
       {
         name: "path",
@@ -2377,7 +2397,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         attributes: {
           class: "pcb-hole",
           fill: colorMap2.drill,
-          d: `M${-radiusX},${-straightLength / 2} v${straightLength} a${radiusX},${radiusX} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radiusX},${radiusX} 0 0 0 -${scaledWidth},0 z`,
+          d: pathD,
           transform: `translate(${x} ${y}) rotate(${-rotation})`,
           "data-type": "pcb_hole",
           "data-pcb-layer": "drill"
@@ -2913,7 +2933,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.236",
+  version: "0.0.238",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -4339,6 +4359,10 @@ var BOARD_STROKE_COLOR = "rgba(0,0,0,0.9)";
 function createSvgObjectsFromPinoutBoard(pcbBoard, ctx) {
   const { transform, soup } = ctx;
   const { width, height, center, outline } = pcbBoard;
+  const sourceBoard = soup.find(
+    (elm) => elm.type === "source_board" && elm.title
+  );
+  const title = sourceBoard?.title;
   let path;
   if (outline && Array.isArray(outline) && outline.length >= 3) {
     path = outline.map((point, index) => {
@@ -4387,7 +4411,7 @@ function createSvgObjectsFromPinoutBoard(pcbBoard, ctx) {
     } else if (cutout.shape === "circle") {
     }
   }
-  return [
+  const svgObjects = [
     {
       name: "path",
       type: "element",
@@ -4404,6 +4428,29 @@ function createSvgObjectsFromPinoutBoard(pcbBoard, ctx) {
       }
     }
   ];
+  if (title) {
+    const titleX = ctx.svgWidth / 2;
+    const titleY = 30;
+    svgObjects.push({
+      name: "text",
+      type: "element",
+      value: "",
+      children: [
+        { name: "", type: "text", value: title, attributes: {}, children: [] }
+      ],
+      attributes: {
+        x: titleX.toString(),
+        y: titleY.toString(),
+        "text-anchor": "middle",
+        "font-size": "18px",
+        "font-weight": "bold",
+        "font-family": "Arial, sans-serif",
+        fill: "black",
+        class: "pinout-board-title"
+      }
+    });
+  }
+  return svgObjects;
 }
 
 // lib/pinout/svg-object-fns/create-svg-objects-from-pinout-component.ts
@@ -5398,6 +5445,9 @@ function convertCircuitJsonToPinoutSvg(soup, options) {
   const paddingMm = 2;
   let svgWidth = options?.width ?? 1200;
   let svgHeight = options?.height ?? 768;
+  const boardTitle = soup.find(
+    (e) => e.type === "source_board" && !!e.title
+  )?.title;
   const board_bounds = { minX, minY, maxX, maxY };
   const pinout_ports = soup.filter(
     (elm) => elm.type === "pcb_port" && elm.is_board_pinout
@@ -5519,7 +5569,9 @@ function convertCircuitJsonToPinoutSvg(soup, options) {
     soup,
     board_bounds,
     styleScale,
-    label_positions
+    label_positions,
+    svgWidth,
+    svgHeight
   };
   const svgObjects = soup.sort(
     (a, b) => (OBJECT_ORDER2.indexOf(a.type) ?? 9999) - (OBJECT_ORDER2.indexOf(b.type) ?? 9999)