!1322 修复:关联切割板件排钻丢失问题

pull/1322/MERGE
ZoeLeeFZ 4 years ago committed by ChenX
parent 0cf9305bc2
commit 46bca579df

@ -27,7 +27,7 @@ export class CheckModeling implements Command
for (let en of brRes.SelectSet.SelectEntityList as Board[])
{
brs.push(...Production.GetSpliteBoards(en));
brs.push(...en.SplitBoards);
}
let feedingTool = FeedingToolPath.GetInstance() as FeedingToolPath;

@ -24,7 +24,7 @@ export class FeedingCommand implements Command
let ens = brRes.SelectSet.SelectEntityList as Board[];
let brs: Board[] = [];
for (let e of ens)
brs.push(...Production.GetSpliteBoards(e));
brs.push(...e.SplitBoards);
if (brs.length > 0)
{
let infos: ISpliteOrderData[] = [];

@ -947,7 +947,7 @@ export class DrawDrillingTool extends Singleton
let i = 0;
for (let e of brs)
{
let bs = Production.GetSpliteBoards(e);
let bs = e.SplitBoards;
bs.forEach(b => b.TempData = e.TempData);
brList.push(...bs);

@ -191,7 +191,7 @@ export async function GetProductsEntitys()
{
if (en instanceof Board)
{
boardList.push(...Production.GetSpliteBoards(en));
boardList.push(...en.SplitBoards);
en.RelativeHardware.forEach(id => !id.IsErase && (id.Object instanceof HardwareCompositeEntity || id.Object instanceof HardwareTopline) && metalsIds.add(id));
}
else

@ -26,7 +26,7 @@ export class LookOverBoardInfos implements Command
for (let e of brsProps)
{
if (e instanceof Board)
ens.push(...Production.GetSpliteBoards(e));
ens.push(...e.SplitBoards);
else
ens.push(e);
}

@ -281,8 +281,10 @@ export class Board extends ExtrudeSolid
{
if (br.__OriginalEnt__)
{
br._DrillList.clear();
br._LayerNails.length = 0;
br._DrillList = new Map(this._DrillList.entries());
br._LayerNails = [...this._LayerNails];
br.ProcessingGroupList = [...this.ProcessingGroupList];
br._BoardProcessOption = { ...this._BoardProcessOption };
}
}
return brs;

@ -519,22 +519,7 @@ export namespace Production
pl.Reverse();
return pl;
}
export function GetSpliteBoards(en: Board)
{
let bs = en.SplitBoards;
for (let b of bs)
{
if (b.__OriginalEnt__)
{
b.BoardProcessOption = en.BoardProcessOption;
b.ProcessingGroupList = en.ProcessingGroupList;
for (let [k, ds] of en.DrillList)
b.AppendDrillList(k, ds);
b.AppendNails(en.LayerNails);
}
}
return bs;
}
export function GetSpiteSize(br: Board)
{
let param = { L: br.Height, W: br.Width, H: br.Thickness };

Loading…
Cancel
Save