circuit-json-to-kicad 0.0.17 → 0.0.18

package/dist/index.js

@@ -1363,7 +1363,7 @@ function createSmdPadFromCircuitJson({
     throw new Error("no support for polygon pads (or any pads w/o X/Y) yet");
   }
   const relativeX = pcbPad.x - componentCenter.x;
-  const relativeY = pcbPad.y - componentCenter.y;
+  const relativeY = -(pcbPad.y - componentCenter.y);
   const layerMap = {
     top: "F.Cu",
     bottom: "B.Cu"
@@ -1403,7 +1403,7 @@ function createThruHolePadFromCircuitJson({
     return null;
   }
   const relativeX = platedHole.x - componentCenter.x;
-  const relativeY = platedHole.y - componentCenter.y;
+  const relativeY = -(platedHole.y - componentCenter.y);
   let padShape = "circle";
   let padSize;
   let drill;
@@ -1682,7 +1682,47 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
+import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+
+// lib/pcb/stages/utils/CreateGrTextFromCircuitJson.ts
+import { GrText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
 import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+function createGrTextFromCircuitJson({
+  textElement,
+  transformationMatrix
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const transformedPosition = applyToPoint8(transformationMatrix, {
+    x: textElement.anchor_position.x,
+    y: textElement.anchor_position.y
+  });
+  const layerMap = {
+    top: "F.SilkS",
+    bottom: "B.SilkS"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const fontSize = (textElement.font_size || 1) / 2;
+  const font = new TextEffectsFont4();
+  font.size = { width: fontSize, height: fontSize };
+  const textEffects = new TextEffects4({
+    font
+  });
+  const rotation = textElement.ccw_rotation || 0;
+  return new GrText({
+    text: textElement.text,
+    position: {
+      x: transformedPosition.x,
+      y: transformedPosition.y,
+      angle: rotation
+    },
+    layer: kicadLayer,
+    effects: textEffects
+  });
+}
+
+// lib/pcb/stages/AddGraphicsStage.ts
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1699,11 +1739,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const startPoint = path.route[i];
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint) continue;
-        const transformedStart = applyToPoint8(c2kMatPcb, {
+        const transformedStart = applyToPoint9(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint8(c2kMatPcb, {
+        const transformedEnd = applyToPoint9(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1723,6 +1763,18 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicLines = graphicLines;
       }
     }
+    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list() || [];
+    for (const textElement of pcbSilkscreenTexts) {
+      const grText = createGrTextFromCircuitJson({
+        textElement,
+        transformationMatrix: c2kMatPcb
+      });
+      if (grText) {
+        const graphicTexts = kicadPcb.graphicTexts || [];
+        graphicTexts.push(grText);
+        kicadPcb.graphicTexts = graphicTexts;
+      }
+    }
     const pcbBoards = this.ctx.db.pcb_board?.list() || [];
     if (pcbBoards.length > 0) {
       const board = pcbBoards[0];
@@ -1744,7 +1796,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint8(c2kMatPcb, corner)
+        (corner) => applyToPoint9(c2kMatPcb, corner)
       );
       for (let i = 0; i < transformedCorners.length; i++) {
         const start = transformedCorners[i];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "type": "module",
   "files": [
     "dist"