Merge pull request !360 from ZoeLeeFZ/thoughHole
pull/360/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent 4df67d493b
commit ce0a42b739

@ -305,6 +305,7 @@ export class DrawDrillingTool extends Singleton
//分析通孔 //分析通孔
if (!this.m_Face.isEqualType) if (!this.m_Face.isEqualType)
{ {
let isThoughtDrillsSet = new WeakSet();
for (let drillent of drills) for (let drillent of drills)
{ {
let isThought = false; let isThought = false;
@ -312,17 +313,23 @@ export class DrawDrillingTool extends Singleton
let p1 = ymjEnt.Position; let p1 = ymjEnt.Position;
for (let refDrill of refDrillList) for (let refDrill of refDrillList)
{ {
if (isThoughtDrillsSet.has(refDrill)) continue;
let refYmjEnt = (arrayLast(refDrill).Object as GangDrill); let refYmjEnt = (arrayLast(refDrill).Object as GangDrill);
let p2 = refYmjEnt.Position; let p2 = refYmjEnt.Position;
let vec = p2.sub(p1); let vec = p2.sub(p1);
if (equaln(vec.length(), this.m_Face.m_LocalBoard.Thickness)) if (equaln(vec.length(), this.m_Face.m_LocalBoard.Thickness))
{ {
isThought = true; isThought = true;
//通孔偏移 isThoughtDrillsSet.add(refDrill);
//通孔改小孔半径
if (!this.m_Option.tIsOffset) if (!this.m_Option.tIsOffset)
{ {
ymjEnt.Radius = this.m_Option.tYmjRad; ymjEnt.Radius = this.m_Option.tYmjRad;
refYmjEnt.Radius = this.m_Option.tYmjRad; refYmjEnt.Radius = this.m_Option.tYmjRad;
//预埋件类型改为通孔
ymjEnt.Type = GangDrillType.TK;
refYmjEnt.Type = GangDrillType.TK;
} }
break; break;
} }

Loading…
Cancel
Save