easyeda 0.0.128 → 0.0.130

package/dist/browser/index.d.ts

@@ -140,6 +140,21 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             radiusY: number;
             lineWidth: number;
             color: string;
+        } | {
+            type: "ARC";
+            id: string;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            radius: number;
+            lineWidth: number;
+            sweepFlag: boolean;
+            color: string;
         } | {
             path: string;
             type: "PIN";
@@ -450,6 +465,63 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             backgroundColor?: string | undefined;
             fontWeight?: "normal" | "bold" | undefined;
             fontStyle?: "normal" | "italic" | undefined;
+        }>, z.ZodObject<{
+            type: z.ZodLiteral<"ARC">;
+            start: z.ZodObject<{
+                x: z.ZodNumber;
+                y: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                x: number;
+                y: number;
+            }, {
+                x: number;
+                y: number;
+            }>;
+            end: z.ZodObject<{
+                x: z.ZodNumber;
+                y: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                x: number;
+                y: number;
+            }, {
+                x: number;
+                y: number;
+            }>;
+            radius: z.ZodNumber;
+            sweepFlag: z.ZodBoolean;
+            color: z.ZodString;
+            lineWidth: z.ZodNumber;
+            id: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            type: "ARC";
+            id: string;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            radius: number;
+            lineWidth: number;
+            sweepFlag: boolean;
+            color: string;
+        }, {
+            type: "ARC";
+            id: string;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            radius: number;
+            lineWidth: number;
+            sweepFlag: boolean;
+            color: string;
         }>]>>, "many">;
         BBox: z.ZodObject<{
             x: z.ZodNumber;
@@ -491,6 +563,21 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             radiusY: number;
             lineWidth: number;
             color: string;
+        } | {
+            type: "ARC";
+            id: string;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            radius: number;
+            lineWidth: number;
+            sweepFlag: boolean;
+            color: string;
         } | {
             path: string;
             type: "PIN";
@@ -1600,6 +1687,21 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             radiusY: number;
             lineWidth: number;
             color: string;
+        } | {
+            type: "ARC";
+            id: string;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            radius: number;
+            lineWidth: number;
+            sweepFlag: boolean;
+            color: string;
         } | {
             path: string;
             type: "PIN";

package/dist/browser/index.js

@@ -212,6 +212,7 @@ var ShapeItemSchema = z.object({
         radiusX: Number(radiusX),
         radiusY: Number(radiusY),
         largeArc: largeArcFlag === "1",
+        // sweepFlag=1 means clockwise (CW), sweepFlag=0 means counter-clockwise (CCW)
         sweepDirection: sweepFlag === "1" ? "CW" : "CCW"
       });
     }
@@ -349,6 +350,40 @@ var parseEllipse = (str) => {
   };
 };
 var EllipseShapeSchema = z2.string().startsWith("E~").transform(parseEllipse).pipe(EllipseShapeOutputSchema);
+var ArcShapeOutputSchema = z2.object({
+  type: z2.literal("ARC"),
+  start: PointSchema2,
+  end: PointSchema2,
+  radius: z2.number(),
+  sweepFlag: z2.boolean(),
+  color: z2.string(),
+  lineWidth: z2.number(),
+  id: z2.string()
+});
+var parseArc = (str) => {
+  const [, pathData, color, lineWidth, , , id] = str.split("~");
+  const parts = pathData.split(" ");
+  const x1 = Number(parts[1]) || 0;
+  const y1 = Number(parts[2]) || 0;
+  const radius = Number(parts[4]) || 0;
+  const sweepFlag = parts[7] === "1";
+  const x2 = Number(parts[8]) || 0;
+  const y2 = Number(parts[9]) || 0;
+  const parsedLineWidth = Number(lineWidth);
+  const finalLineWidth = isNaN(parsedLineWidth) ? 1 : parsedLineWidth;
+  return {
+    type: "ARC",
+    start: { x: x1, y: y1 },
+    end: { x: x2, y: y2 },
+    radius,
+    sweepFlag,
+    color: color || "#880000",
+    // Default color
+    lineWidth: finalLineWidth,
+    id: id || "gge1"
+  };
+};
+var ArcShapeSchema = z2.string().startsWith("A~").transform(parseArc).pipe(ArcShapeOutputSchema);
 var PinShapeOutputSchema = z2.object({
   type: z2.literal("PIN"),
   visibility: z2.enum(["show", "hide"]),
@@ -523,6 +558,7 @@ var SingleLetterShapeSchema = z2.string().transform((x) => {
   if (x.startsWith("PG~")) return PolygonShapeSchema.parse(x);
   if (x.startsWith("PT~")) return PathShapeSchema.parse(x);
   if (x.startsWith("T~")) return TextShapeSchema.parse(x);
+  if (x.startsWith("A~")) return ArcShapeSchema.parse(x);
   throw new Error(`Invalid shape type: ${x}`);
 }).pipe(
   z2.union([
@@ -532,7 +568,8 @@ var SingleLetterShapeSchema = z2.string().transform((x) => {
     PolylineShapeOutputSchema,
     PolygonShapeOutputSchema,
     PathShapeOutputSchema,
-    TextShapeOutputSchema
+    TextShapeOutputSchema,
+    ArcShapeOutputSchema
   ])
 );
 
@@ -2633,13 +2670,13 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
   }
   const h = Math.sqrt(radius * radius - distance2 * distance2 / 4);
   const angle = Math.atan2(dy, dx);
-  const centerX = midX + h * Math.sin(angle) * (sweepFlag ? 1 : -1);
-  const centerY = midY - h * Math.cos(angle) * (sweepFlag ? 1 : -1);
+  const centerX = midX + h * Math.sin(angle) * (sweepFlag ? -1 : 1);
+  const centerY = midY - h * Math.cos(angle) * (sweepFlag ? -1 : 1);
   const startAngle = Math.atan2(startY - centerY, startX - centerX);
   let endAngle = Math.atan2(endY - centerY, endX - centerX);
-  if (!sweepFlag && endAngle > startAngle) {
+  if (sweepFlag && endAngle > startAngle) {
     endAngle -= 2 * Math.PI;
-  } else if (sweepFlag && endAngle < startAngle) {
+  } else if (!sweepFlag && endAngle < startAngle) {
     endAngle += 2 * Math.PI;
   }
   if (!largeArcFlag && Math.abs(endAngle - startAngle) > Math.PI || largeArcFlag && Math.abs(endAngle - startAngle) < Math.PI) {