清理代码

src/Add-on/Fillet.ts

@@ -342,45 +342,8 @@ export class CommandFillet implements Command
             return;
 
         let rem = parF2 - parF1;
-        if (rem === 1 || (rem + 1 === pl.EndParam)//是否相邻
+        if (rem === 1 || (rem + 1 === pl.EndParam))//相邻线段倒角
-        )
         {
-        }
-        else//自交多段线
-        {
-            if (!(c1 instanceof Line && c2 instanceof Line))
-                return;
-
-            let interPts = c1.IntersectWith(c2, IntersectOption.OnBothOperands);
-            if (interPts.length === 0)
-                return;
-
-            let ipt = interPts[0];
-            let splitParam1 = Math.floor(param1) + c1.GetParamAtPoint(ipt);
-            let splitParam2 = Math.floor(param2) + c2.GetParamAtPoint(ipt);
-
-            let cus = pl.GetSplitCurves([splitParam1, splitParam2]);
-            if (cus.length >= 2)
-            {
-                cus.splice(1, 1);
-
-                let pl1 = cus[0];
-                for (let i = 1; i < cus.length; i++)
-                    pl1.Join(cus[i]);
-
-                let es1 = new PromptEntityResult();
-                es1.Entity = pl1;
-                es1.Point = c1.GetPointAtParam(0.1);
-
-                let es2 = new PromptEntityResult();
-                es2.Entity = pl1;
-                es2.Point = c2.GetPointAtParam(0.9);
-
-                return this.FilletPolyLineSelf(es1, es2);
-            }
-        }
-
-
             let es1 = new PromptEntityResult();
             es1.Entity = c1;
             es1.Point = enRes1.Point;
@@ -444,6 +407,40 @@ export class CommandFillet implements Command
                 };
             }
         }
+        else//自交多段线
+        {
+            if (!(c1 instanceof Line && c2 instanceof Line))
+                return;
+
+            let interPts = c1.IntersectWith(c2, IntersectOption.OnBothOperands);
+            if (interPts.length === 0)
+                return;
+
+            let ipt = interPts[0];
+            let splitParam1 = Math.floor(param1) + c1.GetParamAtPoint(ipt);
+            let splitParam2 = Math.floor(param2) + c2.GetParamAtPoint(ipt);
+
+            let cus = pl.GetSplitCurves([splitParam1, splitParam2]);
+            if (cus.length >= 2)
+            {
+                cus.splice(1, 1);
+
+                let pl1 = cus[0];
+                for (let i = 1; i < cus.length; i++)
+                    pl1.Join(cus[i]);
+
+                let es1 = new PromptEntityResult();
+                es1.Entity = pl1;
+                es1.Point = c1.GetPointAtParam(0.1);
+
+                let es2 = new PromptEntityResult();
+                es2.Entity = pl1;
+                es2.Point = c2.GetPointAtParam(0.9);
+
+                return this.FilletPolyLineSelf(es1, es2);
+            }
+        }
+    }
 
     FilletPolylineAndCurve(enRes1: PromptEntityResult, enRes2: PromptEntityResult): FilletRes
     {