circuit-to-svg 0.0.294 → 0.0.296

package/README.md

@@ -172,6 +172,8 @@ const schematicSimulationSvg = convertCircuitJsonToSchematicSimulationSvg({
 - `schematicOptions` – forward additional schematic rendering options (except `width`, `height`, and `includeVersion`).
 - `includeVersion` – if `true`, add a `data-circuit-to-svg-version` attribute to
   the root `<svg>`.
+- `graphAboveSchematic` – if `true`, place the simulation graph above the
+  schematic instead of below (defaults to `false`).
 
 ## convertCircuitJsonToSimulationGraphSvg
 

package/dist/index.d.ts

@@ -341,9 +341,11 @@ interface ConvertSchematicSimulationParams {
     schematicHeightRatio?: number;
     schematicOptions?: Omit<Parameters<typeof convertCircuitJsonToSchematicSvg>[1], "width" | "height" | "includeVersion">;
     includeVersion?: boolean;
+    /** When true, place the simulation graph above the schematic instead of below (defaults to false). */
+    graphAboveSchematic?: boolean;
     showErrorsInTextOverlay?: boolean;
 }
-declare function convertCircuitJsonToSchematicSimulationSvg({ circuitJson, simulation_experiment_id, simulation_transient_voltage_graph_ids, width, height, schematicHeightRatio, schematicOptions, includeVersion, showErrorsInTextOverlay, }: ConvertSchematicSimulationParams): string;
+declare function convertCircuitJsonToSchematicSimulationSvg({ circuitJson, simulation_experiment_id, simulation_transient_voltage_graph_ids, width, height, schematicHeightRatio, schematicOptions, includeVersion, graphAboveSchematic, showErrorsInTextOverlay, }: ConvertSchematicSimulationParams): string;
 
 interface Options {
     layer: "top" | "bottom";

package/dist/index.js

@@ -2751,12 +2751,13 @@ var CHAR_WIDTH = 1;
 var CHAR_SPACING = 0.2;
 var LINE_HEIGHT = 1.4;
 var FONT_SCALE = 0.53;
-function linesToPathData(lines, offsetX, offsetY, charScale) {
+var BASELINE_Y = 0.241;
+function linesToPathData(lines, offsetX, offsetY, charScale, baselineAdjust = 0) {
   return lines.map((line) => {
     const x1 = offsetX + line.x1 * charScale;
-    const y1 = offsetY + (1 - line.y1) * charScale;
+    const y1 = offsetY + (1 - line.y1 + baselineAdjust) * charScale;
     const x2 = offsetX + line.x2 * charScale;
-    const y2 = offsetY + (1 - line.y2) * charScale;
+    const y2 = offsetY + (1 - line.y2 + baselineAdjust) * charScale;
     return `M${x1} ${y1}L${x2} ${y2}`;
   }).join(" ");
 }
@@ -2771,7 +2772,9 @@ function textToAlphabetPath(text, fontSize) {
     }
     const lines = lineAlphabet[char];
     if (lines) {
-      paths.push(linesToPathData(lines, x, 0, fontSize));
+      const isLowercase = char >= "a" && char <= "z";
+      const baselineAdjust = isLowercase ? BASELINE_Y : 0;
+      paths.push(linesToPathData(lines, x, 0, fontSize, baselineAdjust));
     }
     x += charAdvance;
   }
@@ -2804,7 +2807,9 @@ function textToCenteredAlphabetPaths(text, fontSize) {
       }
       const charLines = lineAlphabet[char];
       if (charLines) {
-        paths.push(linesToPathData(charLines, x, y, fontSize));
+        const isLowercase = char >= "a" && char <= "z";
+        const baselineAdjust = isLowercase ? BASELINE_Y : 0;
+        paths.push(linesToPathData(charLines, x, y, fontSize, baselineAdjust));
       }
       x += charAdvance;
     }
@@ -2875,7 +2880,6 @@ function createSvgObjectsFromPcbCopperText(pcbCopperText, ctx) {
               id: maskId
             },
             children: [
-              // White background - area that will show copper
               {
                 name: "rect",
                 type: "element",
@@ -2889,7 +2893,6 @@ function createSvgObjectsFromPcbCopperText(pcbCopperText, ctx) {
                 },
                 children: []
               },
-              // Black text strokes - area that will be cut out
               {
                 name: "path",
                 type: "element",
@@ -5562,7 +5565,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.293",
+  version: "0.0.295",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -12793,6 +12796,7 @@ function convertCircuitJsonToSchematicSimulationSvg({
   schematicHeightRatio = DEFAULT_SCHEMATIC_RATIO,
   schematicOptions,
   includeVersion,
+  graphAboveSchematic = false,
   showErrorsInTextOverlay
 }) {
   const schematicElements = circuitJson.filter(
@@ -12823,18 +12827,33 @@ function convertCircuitJsonToSchematicSimulationSvg({
   const schematicNode = ensureElementNode(parseSync3(schematicSvg));
   const simulationNode = ensureElementNode(parseSync3(simulationSvg));
   const combinedChildren = [];
-  combinedChildren.push(
-    translateNestedSvg(schematicNode, 0, 0, width, schematicHeight)
-  );
-  combinedChildren.push(
-    translateNestedSvg(
-      simulationNode,
-      0,
-      schematicHeight,
-      width,
-      simulationHeight
-    )
-  );
+  if (graphAboveSchematic) {
+    combinedChildren.push(
+      translateNestedSvg(simulationNode, 0, 0, width, simulationHeight)
+    );
+    combinedChildren.push(
+      translateNestedSvg(
+        schematicNode,
+        0,
+        simulationHeight,
+        width,
+        schematicHeight
+      )
+    );
+  } else {
+    combinedChildren.push(
+      translateNestedSvg(schematicNode, 0, 0, width, schematicHeight)
+    );
+    combinedChildren.push(
+      translateNestedSvg(
+        simulationNode,
+        0,
+        schematicHeight,
+        width,
+        simulationHeight
+      )
+    );
+  }
   const softwareUsedString = getSoftwareUsedString(schematicElements);
   const svgObject = {
     name: "svg",