feat: visio接口

le5le-com · Sep 29, 2024 · 73bda73 · 73bda73
1 parent 20ec837
commit 73bda73
Showing 1 changed file with 73 additions and 10 deletions.
diff --git a/packages/core/src/pen/render.ts b/packages/core/src/pen/render.ts
@@ -1749,6 +1749,7 @@ export function ctxDrawPath(
   store: Meta2dStore,
   fill: boolean
 ) {
+  if(pen.name === 'drawCommand')return;
   const path = canUsePath
     ? store.path2dMap.get(pen)
     : globalStore.path2dDraws[pen.name];
@@ -3653,6 +3654,9 @@ function dealWithVisio(command, pen, startX, startY) {
       const axisRatio =
         command.v.D * (width / height) * (originHeight / originWidth); // 长轴和短轴的比率
       //
+
+      const crossProduct = (endX - startX) * (ctrlY - startY) - (endY - startY) * (ctrlX - startX) > 0;
+
       const params = calculateEllipseParameters(
         startX,
         startY,
@@ -3692,12 +3696,68 @@ function dealWithVisio(command, pen, startX, startY) {
           // startAngle: 0,
           // endAngle: Math.PI * 2,
           // anticlockwise: startA > 0 && startA>endA
-          anticlockwise: +angleDeg < 0,
+          anticlockwise: crossProduct,
           // anticlockwise: Math.abs(endA - startA) < Math.PI
         },
         startX: endX,
         startY: endY,
       };
+    case "RelEllipticalArcTo":
+      const endX3 = command.v.X * originWidth * (width / originWidth) + x; // 弧上结束顶点的 x 坐标
+      const endY3 = command.v.Y * originHeight * (height / originHeight) + y; // 弧上结束顶点的 y 坐标
+      const ctrlX3 = command.v.A * originWidth * (width / originWidth) + x; // 控制点的 x 坐标
+      const ctrlY3 = command.v.B * originHeight * (height / originHeight) + y; // 控制点的 y 坐标
+      const angleDeg3 = command.v.C; // 主轴相对于 x 轴的角度 (度)
+      const axisRatio3 =
+        command.v.D * (width / height) * (originHeight / originWidth); // 长轴和短轴的比率
+      //
+      const crossProduct2 = (endX3 - startX) * (ctrlY3 - startY) - (endY3 - startY) * (ctrlX3 - startX) > 0;
+
+      const params2 = calculateEllipseParameters(
+        startX,
+        startY,
+        endX3,
+        endY3,
+        ctrlX3,
+        ctrlY3,
+        axisRatio3
+      );
+      // 开始绘制路径
+      !command.orign && (command.orign = {});
+      !command.orign.startA &&
+      (command.orign.startA = calculateAngleInRadians(
+        params2.x0,
+        params2.y0,
+        startX,
+        startY
+      ));
+      !command.orign.endA &&
+      (command.orign.endA = calculateAngleInRadians(
+        params2.x0,
+        params2.y0,
+        endX3,
+        endY3
+      ));
+      return {
+        c: 'ellipse',
+        v: {
+          centerX: params2.x0,
+          centerY: params2.y0,
+          radiuX: params2.a,
+          radiuY: params2.b,
+          // rotation:radiansToDegrees(angleDeg),
+          rotation: 0,
+          startAngle: command.orign.startA,
+          endAngle: command.orign.endA,
+          // startAngle: 0,
+          // endAngle: Math.PI * 2,
+          // anticlockwise: startA > 0 && startA>endA
+          anticlockwise: crossProduct2
+          // anticlockwise: Math.abs(endA - startA) < Math.PI
+        },
+        startX: endX3,
+        startY: endY3,
+      };
     case 'ArcTo':
       let endX2 = (command.v.X * 100 * width) / originWidth + x;
       let endY2 = (command.v.Y * 100 * height) / originHeight + y;
@@ -3741,16 +3801,19 @@ function dealWithVisio(command, pen, startX, startY) {
           aclockwise: true,
         },
       };
-    // case "RelCubBezTo":
-    //   return {
-    //     c:"bezierCurveTo",
-    //     v:{
-    //
-    //     }
-    //   };
     default:
-      // console.log(command.c);
-      return {};
+      const cloneCommand = deepClone(command)
+      Object.entries(cloneCommand.v).forEach(([k,v]:any)=>{
+        // 表明此类型为
+          if(k.endsWith?.('_x')){
+            if(typeof v === "number") cloneCommand.v[k] = v * (width / originWidth) + x;
+          } else if(k.endsWith?.("_y")){
+            if(typeof v === "number") cloneCommand.v[k] = v * (height / originHeight) + y;
+          }else {
+            if(typeof v === "number") cloneCommand.v[k] = v
+          }
+      })
+      return cloneCommand;
   }
 }
 export function setChildValue(pen: Pen, data: IValue) {