From ce0a42b739da8938ae6657920d576e04f7c57df3 Mon Sep 17 00:00:00 2001 From: ZoeLeeFZ Date: Thu, 27 Jun 2019 11:33:40 +0800 Subject: [PATCH] !360 fixes #IYEYX Merge pull request !360 from ZoeLeeFZ/thoughHole --- src/Add-on/DrawDrilling/DrawDrillingTool.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index 53f185874..cdba3d7ef 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -305,6 +305,7 @@ export class DrawDrillingTool extends Singleton //分析通孔 if (!this.m_Face.isEqualType) { + let isThoughtDrillsSet = new WeakSet(); for (let drillent of drills) { let isThought = false; @@ -312,17 +313,23 @@ export class DrawDrillingTool extends Singleton let p1 = ymjEnt.Position; for (let refDrill of refDrillList) { + if (isThoughtDrillsSet.has(refDrill)) continue; + let refYmjEnt = (arrayLast(refDrill).Object as GangDrill); let p2 = refYmjEnt.Position; let vec = p2.sub(p1); if (equaln(vec.length(), this.m_Face.m_LocalBoard.Thickness)) { isThought = true; - //通孔偏移 + isThoughtDrillsSet.add(refDrill); + //通孔改小孔半径 if (!this.m_Option.tIsOffset) { ymjEnt.Radius = this.m_Option.tYmjRad; refYmjEnt.Radius = this.m_Option.tYmjRad; + //预埋件类型改为通孔 + ymjEnt.Type = GangDrillType.TK; + refYmjEnt.Type = GangDrillType.TK; } break; }