From c9f98c8e36070c4d32165cfc410c955a3ae9e9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com> Date: Tue, 3 Sep 2024 00:10:17 +0000 Subject: [PATCH] =?UTF-8?q?!3054=20=E4=BF=AE=E5=A4=8D:=E6=8E=92=E9=92=BB?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=81=8F=E7=A7=BB=E5=9C=A8=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=81=8F=E7=A7=BB=E6=97=B6=E8=80=83=E8=99=91=E9=80=9A?= =?UTF-8?q?=E5=AD=94=E5=81=8F=E7=A7=BB=E8=B7=9D=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawDrilling/DrawDrillingTool.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index c70dd2ade..06c6ddc6c 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -700,7 +700,7 @@ export class DrawDrillingTool extends Singleton ((offsetDist && this.m_Option.isDrawWood) ? !FindInWall(dist + offsetDist, this.m_Face.Segment1D) : false)) { //计算偏移可放置数值 - let { closestNum } = FindClosestInterval(dist, this.m_Face.Segment1D, this.m_Face.Length, this._MoveMinDist, offsetDist); + let { closestNum } = FindClosestInterval(dist, this.m_Face.Segment1D, this.m_Face.Length, this._MoveMinDist, offsetDist, this.m_Option.tHoleOffset); //偏移超出邻边两侧排钻距离 let leftIndex = this.m_Option.isFromBack ? (i + 1) : (i - 1); @@ -1602,8 +1602,11 @@ export class DrawDrillingTool extends Singleton return; } - //适用于距离大于200 - this._AutoDeviation = !this.m_Option.haveDist && !this.m_Option.useTemp && + // 1.不是间距32倍 且第二个排钻距第一个排钻 + // 2.不使用模块 + // 3.勾选自动偏移 + // 4.适用于距离大于200 + this._AutoDeviation = !(this.m_Option.spacing === SpacingType.Multiple32 && this.m_Option.haveDist) && !this.m_Option.useTemp && HostApplicationServices.autoDeviation && this.m_Face.Length >= HostApplicationServices.autoDeviationMinDist; //智能偏移获取可以放置排钻的区间