|
|
@ -11,7 +11,7 @@ import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline
|
|
|
|
import { ObjectId } from "../../DatabaseServices/ObjectId";
|
|
|
|
import { ObjectId } from "../../DatabaseServices/ObjectId";
|
|
|
|
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
|
|
|
|
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
|
|
|
|
import { CoordinateSystem } from "../../Geometry/CoordinateSystem";
|
|
|
|
import { CoordinateSystem } from "../../Geometry/CoordinateSystem";
|
|
|
|
import { AsVector2, GetBoxArr, ZeroVec, equalv3 } from "../../Geometry/GeUtils";
|
|
|
|
import { GetBoxArr, IdentityMtx4, equalv2 } from "../../Geometry/GeUtils";
|
|
|
|
import { IContourData } from "../../Production/Convert2PtsBul";
|
|
|
|
import { IContourData } from "../../Production/Convert2PtsBul";
|
|
|
|
import { I2DModeling, I3DContourData, I3DModeling, IDrillingOption, IHardwareType, IModelingData, ISpliteHardwareData, ISpliteOrderData, Production } from '../../Production/Product';
|
|
|
|
import { I2DModeling, I3DContourData, I3DModeling, IDrillingOption, IHardwareType, IModelingData, ISpliteHardwareData, ISpliteOrderData, Production } from '../../Production/Product';
|
|
|
|
import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface";
|
|
|
|
import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface";
|
|
|
@ -689,15 +689,15 @@ export class ErpParseData
|
|
|
|
let pl = br.ContourCurve;
|
|
|
|
let pl = br.ContourCurve;
|
|
|
|
if (pl instanceof Circle) pl = ConverCircleToPolyline(pl);
|
|
|
|
if (pl instanceof Circle) pl = ConverCircleToPolyline(pl);
|
|
|
|
else pl = pl.Clone();
|
|
|
|
else pl = pl.Clone();
|
|
|
|
let box = pl.BoundingBox;
|
|
|
|
//修正轮廓基点(因为那边没有OCS)
|
|
|
|
//修正轮廓基点
|
|
|
|
let ptsBuls = pl.MatrixAlignTo2(IdentityMtx4);
|
|
|
|
if (!equalv3(box.min, ZeroVec)) pl.Position = pl.Position.sub(box.min);
|
|
|
|
|
|
|
|
if (!equalv3(pl.Position, ZeroVec))
|
|
|
|
//避免CloseMark
|
|
|
|
|
|
|
|
if (!equalv2(ptsBuls.pts[0], ptsBuls.pts[ptsBuls.pts.length - 1]))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let v = AsVector2(pl.Position);
|
|
|
|
ptsBuls.pts.push(ptsBuls.pts[0]);
|
|
|
|
for (let vd of pl.LineData) vd.pt.add(v);
|
|
|
|
ptsBuls.buls.push(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let ptsBuls = pl.PtsBuls;
|
|
|
|
|
|
|
|
//点表
|
|
|
|
//点表
|
|
|
|
brModelData.Pts = ptsBuls.pts;
|
|
|
|
brModelData.Pts = ptsBuls.pts;
|
|
|
|
brModelData.Buls = ptsBuls.buls;
|
|
|
|
brModelData.Buls = ptsBuls.buls;
|
|
|
|