From 88d1532327937cdb49d01bdd6b3663510b1921a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com>
Date: Fri, 18 Aug 2023 09:19:37 +0000
Subject: [PATCH] =?UTF-8?q?!2364=20=E4=BF=AE=E5=A4=8D:=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E5=88=80=E8=B7=AF=E5=8F=8D=E9=9D=A2=E6=8C=96=EF=BC=8C=E7=BA=BF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E9=9D=A2=E4=B8=8A=E5=92=8C=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=9C=A8=E6=9D=BF=E8=BE=B9=E4=BC=9A=E6=9C=89=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DatabaseServices/Entity/Board.ts         |  6 ++++--
 src/UI/Components/Board/BoardConfigModal.tsx | 14 ++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/DatabaseServices/Entity/Board.ts b/src/DatabaseServices/Entity/Board.ts
index b73db0e14..7e2d61508 100644
--- a/src/DatabaseServices/Entity/Board.ts
+++ b/src/DatabaseServices/Entity/Board.ts
@@ -1313,16 +1313,18 @@ export class Board extends ExtrudeSolid
 
                         let curves = VData2Curve(VKnifToolPath(tempPath, item.depth, item.knife.angle / 2));
                         let o = new Object3D();
-                        o.position.z = -item.depth;
                         for (let c of curves)
                         {
                             c.ColorIndex = tempPath.ColorIndex;
                             o.add(c.GetDrawObjectFromRenderType(RenderType.Wireframe));
                         }
                         if (vm.dir === FaceDirection.Back)
+                        {
                             o.applyMatrix4(ZMirrorMatrix);
+                            o.position.z = item.depth;
+                        }
                         else
-                            o.position.z += this.thickness;
+                            o.position.z = this.thickness - item.depth;
                         o.updateMatrix();
                         this._2DPathDrawObject.add(o);
 
diff --git a/src/UI/Components/Board/BoardConfigModal.tsx b/src/UI/Components/Board/BoardConfigModal.tsx
index 67fd873fa..b8d4ebc54 100644
--- a/src/UI/Components/Board/BoardConfigModal.tsx
+++ b/src/UI/Components/Board/BoardConfigModal.tsx
@@ -354,6 +354,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
 
         //记录初始世界UCS
         let backUCSMatrix = app.Editor.UCSMatrix;
+        let backVisibleUCS = app.Editor.UcsServices.Visible;
         //记录初始相机状态
         let backCamera = new CADFiler;
         app.Viewer.CameraCtrl.WriteFile(backCamera);
@@ -364,7 +365,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
 
         //UCS W0
         app.Editor.UCSMatrix = IdentityMtx4;
-
+        app.Editor.UcsServices.Visible = false;
         //改变观察视角
         app.Viewer.CameraCtrl.LookAt(ZAxisN);
         app.Viewer.CameraCtrl.ZoomExtentsBox3(brCurve.BoundingBox.expandByScalar(1000));
@@ -414,6 +415,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
                     TempEditor.End();
                     app.Editor.UCSMatrix = backUCSMatrix;
                     app.Viewer.CameraCtrl.ReadFile(backCamera);
+                    app.Editor.UcsServices.Visible = backVisibleUCS;
                 }
             }
         }, EDITOR_2D_PATH);
@@ -435,12 +437,12 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
             }
         }
 
-        let cuGourp = curveLinkGroup(finalCurve);
         let pathMap = new Map<number, Polyline[]>();
 
-        if (cuGourp)
+        await CommandWrap(() =>
         {
-            await CommandWrap(async () =>
+            let cuGourp = curveLinkGroup(finalCurve);
+            if (cuGourp)
             {
                 const rightStore = RightPanelStore.GetInstance();
 
@@ -482,8 +484,8 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
 
                     }
                 }
-            }, "分析二维刀路");
-        }
+            }
+        }, "分析二维刀路");
 
         AppToaster.dismiss(EDITOR_2D_PATH);