circuit-to-svg 0.0.300 → 0.0.301

package/dist/index.js

@@ -622,6 +622,9 @@ function normalize(vector) {
   const length = Math.hypot(vector.x, vector.y) || 1;
   return { x: vector.x / length, y: vector.y / length };
 }
+var TEXT_OFFSET_MULTIPLIER = 1.5;
+var CHARACTER_WIDTH_MULTIPLIER = 0.6;
+var TEXT_INTERSECTION_PADDING_MULTIPLIER = 0.3;
 function toPath(points) {
   return points.map(
     (point, index) => index === 0 ? `M ${point.x} ${point.y}` : `L ${point.x} ${point.y}`
@@ -640,7 +643,8 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     pcb_component_id,
     pcb_fabrication_note_dimension_id,
     offset_distance,
-    offset_direction
+    offset_direction,
+    text_ccw_rotation
   } = dimension;
   if (layerFilter && layer && layer !== layerFilter) return [];
   if (!from || !to || typeof from !== "object" || typeof to !== "object") {
@@ -751,12 +755,6 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     x: (from.x + to.x) / 2 + offsetVector.x,
     y: (from.y + to.y) / 2 + offsetVector.y
   };
-  const textOffset = arrowSize * 1.5;
-  const textPoint = {
-    x: midPoint.x + perpendicular.x * textOffset,
-    y: midPoint.y + perpendicular.y * textOffset
-  };
-  const [textX, textY] = applyToPoint6(transform, [textPoint.x, textPoint.y]);
   const [screenFromX, screenFromY] = applyToPoint6(transform, [
     fromOffset.x,
     fromOffset.y
@@ -773,6 +771,25 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
   if (textAngle > 90 || textAngle < -90) {
     textAngle += 180;
   }
+  const finalTextAngle = typeof text_ccw_rotation === "number" && Number.isFinite(text_ccw_rotation) ? textAngle - text_ccw_rotation : textAngle;
+  let additionalOffset = 0;
+  if (text && typeof text_ccw_rotation === "number" && Number.isFinite(text_ccw_rotation)) {
+    const textWidth = text.length * font_size * CHARACTER_WIDTH_MULTIPLIER;
+    const textHeight = font_size;
+    const rotationRad = text_ccw_rotation * Math.PI / 180;
+    const sinRot = Math.abs(Math.sin(rotationRad));
+    const cosRot = Math.abs(Math.cos(rotationRad));
+    const halfWidth = textWidth / 2;
+    const halfHeight = textHeight / 2;
+    const maxExtension = halfWidth * sinRot + halfHeight * cosRot;
+    additionalOffset = maxExtension + font_size * TEXT_INTERSECTION_PADDING_MULTIPLIER;
+  }
+  const textOffset = arrowSize * TEXT_OFFSET_MULTIPLIER + additionalOffset;
+  const textPoint = {
+    x: midPoint.x + perpendicular.x * textOffset,
+    y: midPoint.y + perpendicular.y * textOffset
+  };
+  const [textX, textY] = applyToPoint6(transform, [textPoint.x, textPoint.y]);
   const transformedFontSize = font_size * Math.abs(transform.a);
   const children = [
     ...extensionSegments,
@@ -827,7 +844,7 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
         "text-anchor": "middle",
         "dominant-baseline": "central",
         class: "pcb-fabrication-note-dimension-text",
-        transform: `rotate(${textAngle} ${textX} ${textY})`
+        transform: `rotate(${finalTextAngle} ${textX} ${textY})`
       },
       children: [
         {
@@ -1126,7 +1143,8 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
     color,
     arrow_size,
     offset_distance,
-    offset_direction
+    offset_direction,
+    text_ccw_rotation
   } = dimension;
   if (!from || !to) {
     console.error("Invalid pcb_note_dimension endpoints", { from, to });
@@ -1221,12 +1239,6 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
     x: (from.x + to.x) / 2 + offsetVector.x,
     y: (from.y + to.y) / 2 + offsetVector.y
   };
-  const textOffset = arrow_size * 1.5;
-  const textPoint = {
-    x: midPoint.x + perpendicular.x * textOffset,
-    y: midPoint.y + perpendicular.y * textOffset
-  };
-  const [textX, textY] = applyToPoint7(transform, [textPoint.x, textPoint.y]);
   const [screenFromX, screenFromY] = applyToPoint7(transform, [
     fromOffset.x,
     fromOffset.y
@@ -1243,6 +1255,25 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
   if (textAngle > 90 || textAngle < -90) {
     textAngle += 180;
   }
+  const finalTextAngle = typeof text_ccw_rotation === "number" && Number.isFinite(text_ccw_rotation) ? textAngle - text_ccw_rotation : textAngle;
+  let additionalOffset = 0;
+  if (text && typeof text_ccw_rotation === "number" && Number.isFinite(text_ccw_rotation)) {
+    const textWidth = text.length * font_size * 0.6;
+    const textHeight = font_size;
+    const rotationRad = text_ccw_rotation * Math.PI / 180;
+    const sinRot = Math.abs(Math.sin(rotationRad));
+    const cosRot = Math.abs(Math.cos(rotationRad));
+    const halfWidth = textWidth / 2;
+    const halfHeight = textHeight / 2;
+    const maxExtension = halfWidth * sinRot + halfHeight * cosRot;
+    additionalOffset = maxExtension + font_size * 0.3;
+  }
+  const textOffset = arrow_size * 1.5 + additionalOffset;
+  const textPoint = {
+    x: midPoint.x + perpendicular.x * textOffset,
+    y: midPoint.y + perpendicular.y * textOffset
+  };
+  const [textX, textY] = applyToPoint7(transform, [textPoint.x, textPoint.y]);
   const transformedFontSize = font_size * Math.abs(transform.a);
   const children = [
     ...extensionSegments,
@@ -1297,7 +1328,7 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
         "text-anchor": "middle",
         "dominant-baseline": "central",
         class: "pcb-note-dimension-text",
-        transform: `rotate(${textAngle} ${textX} ${textY})`
+        transform: `rotate(${finalTextAngle} ${textX} ${textY})`
       },
       children: [
         {
@@ -5674,7 +5705,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.299",
+  version: "0.0.300",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [