From ab8ddb35c724a6c12a94b90435165c3c1fed745b Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Fri, 25 Aug 2023 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E5=98=89=E5=B1=85=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=9C=86=E5=BC=A7=E6=9D=BF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/JiaJu/Import/JiaJuImport.ts    | 10 +++++-----
 src/Add-on/JiaJu/Import/JiaJuInterface.ts |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Add-on/JiaJu/Import/JiaJuImport.ts b/src/Add-on/JiaJu/Import/JiaJuImport.ts
index 3aea94684..b8719f6bb 100644
--- a/src/Add-on/JiaJu/Import/JiaJuImport.ts
+++ b/src/Add-on/JiaJu/Import/JiaJuImport.ts
@@ -388,11 +388,11 @@ function JiajuPath2Polyline(path: JiaJu.Path)
             cus.push(new Line(p1, p2));
         else
         {
-            let arc = new Arc(new Vector3(parseFloat(geCurve.ArcCenX), parseFloat(geCurve.ArcCenY), parseFloat(geCurve.ArcCenZ)));
-            arc.Radius = arc.Center.distanceTo(p1);
-            arc.IsClockWise = false;
-            arc.StartAngle = arc.GetAngleAtPoint(p1);
-            arc.EndAngle = arc.GetAngleAtPoint(p2);
+            let arc = new Arc().FromThreePoint(
+                p1,
+                new Vector3(parseFloat(geCurve.MidX), parseFloat(geCurve.MidY)),
+                p2,
+            );
             cus.push(arc);
         }
     }
diff --git a/src/Add-on/JiaJu/Import/JiaJuInterface.ts b/src/Add-on/JiaJu/Import/JiaJuInterface.ts
index 97ca50d0a..6fd97ac46 100644
--- a/src/Add-on/JiaJu/Import/JiaJuInterface.ts
+++ b/src/Add-on/JiaJu/Import/JiaJuInterface.ts
@@ -154,6 +154,10 @@ namespace JiaJu
         ArcCenY: string;
         ArcCenZ: string;
 
+        MidX: string,
+        MidY: string,
+        MidZ: string,
+
         ArcCen: string;//xyz
     }