|
|
|
@ -13,7 +13,7 @@ import { BufferGeometry, Euler, FrontSide, Frustum, Geometry, LineSegments, Matr
|
|
|
|
|
import { Board2Regions } from '../../Add-on/BoardEditor/Board2Regions';
|
|
|
|
|
import { DeserializationBoard2DModeingData, DeserializationBoard3DModeingData, SerializeBoard2DModeingData, SerializeBoard3DModeingData, deserializationBoardData, serializeBoardData } from '../../Add-on/BoardEditor/SerializeBoardData';
|
|
|
|
|
import { DrillType, FaceDirection } from "../../Add-on/DrawDrilling/DrillType";
|
|
|
|
|
import { CyHoleInBoard, ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType, TempRectHoleOption } from '../../Add-on/DrawDrilling/HoleUtils';
|
|
|
|
|
import { CyHoleInBoard, IBoardRectHoleType, ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from '../../Add-on/DrawDrilling/HoleUtils';
|
|
|
|
|
import { HostApplicationServices } from '../../ApplicationServices/HostApplicationServices';
|
|
|
|
|
import { AddEntityDrawObject } from '../../Common/AddEntityDrawObject';
|
|
|
|
|
import { arrayRemoveIf, arraySortByNumber, arraySum } from '../../Common/ArrayExt';
|
|
|
|
@ -882,8 +882,8 @@ export class Board extends ExtrudeSolid
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
//上下左右排钻属性(在矩形时生效)
|
|
|
|
|
TempRectHoleOption.up = undefined;
|
|
|
|
|
ParseBoardRectHoleType(this, TempRectHoleOption);//分析旧的上下左右排钻
|
|
|
|
|
let rectHoleOpt: IBoardRectHoleType = {} as any;
|
|
|
|
|
ParseBoardRectHoleType(this, rectHoleOpt);//分析旧的上下左右排钻
|
|
|
|
|
|
|
|
|
|
let oldHightSealCurves = GetBoardSealingCurves(this);//旧的封边轮廓
|
|
|
|
|
let oldHightSealDatas = GetBoardHighSeal(this, oldHightSealCurves);//旧的封边数据
|
|
|
|
@ -904,8 +904,8 @@ export class Board extends ExtrudeSolid
|
|
|
|
|
super.ContourCurve = newContour;//设置新的轮廓
|
|
|
|
|
|
|
|
|
|
//保持排钻边属性
|
|
|
|
|
if (this.isRect && TempRectHoleOption.up)//矩形->矩形
|
|
|
|
|
SetBrHighHoleTypeFromRectHoleType(this, TempRectHoleOption);//直接应用旧的矩形数据
|
|
|
|
|
if (this.isRect && rectHoleOpt.up)//矩形->矩形
|
|
|
|
|
SetBrHighHoleTypeFromRectHoleType(this, rectHoleOpt);//直接应用旧的矩形数据
|
|
|
|
|
else//异形->矩形 矩形->异形 异形->异形
|
|
|
|
|
{
|
|
|
|
|
let indexMap: number[] = [];
|
|
|
|
|