|
|
@ -782,6 +782,8 @@ export class DrawDrillingTool extends Singleton
|
|
|
|
let drillBox = drill.BoundingBox;
|
|
|
|
let drillBox = drill.BoundingBox;
|
|
|
|
if (this.m_Face.InterBoard.Grooves.some(groove => groove.BoundingBox.intersect(drillBox).Volume > 0))
|
|
|
|
if (this.m_Face.InterBoard.Grooves.some(groove => groove.BoundingBox.intersect(drillBox).Volume > 0))
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (this.m_Face.LocalBoard.Grooves.some(groove => groove.BoundingBox.intersect(drillBox).Volume > 0))
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
};
|
|
|
|
};
|
|
|
@ -796,9 +798,9 @@ export class DrawDrillingTool extends Singleton
|
|
|
|
Log(`${this.m_Face.LocalBoard.Name}-${this.m_Face.InterBoard.Name}有${isWoodPinss ? "木梢" : "通孔排钻"}偏移后与造型碰撞,跳过绘制`);
|
|
|
|
Log(`${this.m_Face.LocalBoard.Name}-${this.m_Face.InterBoard.Name}有${isWoodPinss ? "木梢" : "通孔排钻"}偏移后与造型碰撞,跳过绘制`);
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//偏移后判断是否在两个板件外面 #I7NPAV
|
|
|
|
//偏移后判断是否在两个排钻板件的外面 #I7NPAV
|
|
|
|
else if (!CyHoleInBoard(moveAfterDrills, this.m_Face.InterBoard, this.m_Face.InterBoard.OCSInv) &&
|
|
|
|
else if (!CyHoleInBoard(moveAfterDrills, this.m_Face.InterBoard, this.m_Face.InterBoard.OCSInv, true) &&
|
|
|
|
!CyHoleInBoard(moveAfterDrills, this.m_Face.LocalBoard, this.m_Face.LocalBoard.OCSInv))
|
|
|
|
!CyHoleInBoard(moveAfterDrills, this.m_Face.LocalBoard, this.m_Face.LocalBoard.OCSInv, true))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Log(`${this.m_Face.LocalBoard.Name}-${this.m_Face.InterBoard.Name}有${isWoodPinss ? "木梢" : "通孔排钻"}偏移后在板件外,跳过绘制`);
|
|
|
|
Log(`${this.m_Face.LocalBoard.Name}-${this.m_Face.InterBoard.Name}有${isWoodPinss ? "木梢" : "通孔排钻"}偏移后在板件外,跳过绘制`);
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|
needRemoveDrillList.add(hole);
|
|
|
|