From 745aa6b9595ee31f0bada43c9c06c7653be7f8d9 Mon Sep 17 00:00:00 2001 From: ZoeLeeFZ Date: Fri, 6 Nov 2020 17:28:57 +0800 Subject: [PATCH] =?UTF-8?q?!1292=20=E4=BF=AE=E5=A4=8D:=E8=B5=B0=E5=88=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/CommandFeeding.ts | 2 +- src/GraphicsSystem/ToolPath/FeedingToolPath.ts | 2 +- src/Production/Product.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Add-on/CommandFeeding.ts b/src/Add-on/CommandFeeding.ts index f0994b032..7ac538738 100644 --- a/src/Add-on/CommandFeeding.ts +++ b/src/Add-on/CommandFeeding.ts @@ -112,7 +112,7 @@ export class FeedingCommand implements Command { for (let cd of data.feeding) { - let c = Production.Data2Polyline(cd); + let c = Production.Data2Polyline(cd, false); c.ColorIndex = 1; c.ApplyMatrix(tMtx); app.Database.ModelSpace.Append(c); diff --git a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts index 67e2ad856..925e7bb8e 100644 --- a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts +++ b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts @@ -139,7 +139,7 @@ export class FeedingToolPath extends Singleton if (isOut) { let outlineOffsetCus = outline.GetOffsetCurves(dir * knifRadius).filter(c => c.IsClose) as Curve[]; - let outlineCus = GetOffsetCurves(outline, dir * knifRadius); + let outlineCus = GetOffsetCurves(outline, dir * knifRadius).filter(c => c.IsClose) as Curve[];; let ho = holeOffsetCus[i]; let maxArea = Math.max(...(outlineOffsetCus.map(c => c.Area))); for (let j = 0; j < outlineOffsetCus.length; j++) diff --git a/src/Production/Product.ts b/src/Production/Product.ts index 04edfe81e..a24fcfed2 100644 --- a/src/Production/Product.ts +++ b/src/Production/Product.ts @@ -1002,10 +1002,11 @@ export namespace Production } return sizeData; } - export function Data2Polyline(data: IContourData) + export function Data2Polyline(data: IContourData, isClose = true) { let pl = new Polyline(data.pts.map((p, i) => ({ pt: new Vector2(p.x, p.y), bul: data.buls[i] }))); - pl.CloseMark = true; + if (isClose) + pl.CloseMark = true; return pl; } }