|
|
|
@ -36,13 +36,13 @@ export class AutoHoleFaceSetting implements Command
|
|
|
|
|
if (brRes.Status === PromptStatus.OK)
|
|
|
|
|
{
|
|
|
|
|
let brs = brRes.SelectSet.SelectEntityList as Board[];
|
|
|
|
|
const filterBoardsSet = new Set(autoHoleFaceSettingStore.option.filterBoards.split(',').filter(item => item.trim() !== ''));
|
|
|
|
|
const filterDrillArraySet = new Set(autoHoleFaceSettingStore.option.filterDrill.split(',').filter(item => item.trim() !== ''));
|
|
|
|
|
for (let br of brs)
|
|
|
|
|
{
|
|
|
|
|
let p = br.Position;
|
|
|
|
|
const filterDrillArray = autoHoleFaceSettingStore.option.filterDrill.split(',').filter(item => item.trim() !== '');
|
|
|
|
|
if (p.z > autoHoleFaceSettingStore.option.hight &&
|
|
|
|
|
!filterDrillArray.some(item => item === br.BoardProcessOption[EBoardKeyList.DrillType])
|
|
|
|
|
)
|
|
|
|
|
if (filterBoardsSet.has(br.Name) || filterDrillArraySet.has(br.BoardProcessOption[EBoardKeyList.DrillType])) continue;
|
|
|
|
|
if (p.z > autoHoleFaceSettingStore.option.hight)
|
|
|
|
|
br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Front;
|
|
|
|
|
else
|
|
|
|
|
br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Back;
|
|
|
|
@ -73,18 +73,20 @@ export class AutoHoleFaceSettingStore extends Singleton implements IConfigStore
|
|
|
|
|
@observable configName = "默认";
|
|
|
|
|
@observable configsNames = ['默认'];
|
|
|
|
|
@observable option: IAutoHoleFaceOption = {
|
|
|
|
|
version: 1,
|
|
|
|
|
version: 2,
|
|
|
|
|
hight: 1500,
|
|
|
|
|
filterDrill: ''
|
|
|
|
|
filterDrill: '',
|
|
|
|
|
filterBoards: '',
|
|
|
|
|
};
|
|
|
|
|
@observable uiOption: IUiOption<IAutoHoleFaceOption>;
|
|
|
|
|
|
|
|
|
|
InitOption()
|
|
|
|
|
{
|
|
|
|
|
Object.assign(this.option, {
|
|
|
|
|
version: 1,
|
|
|
|
|
version: 2,
|
|
|
|
|
hight: 1500,
|
|
|
|
|
filterDrill: ''
|
|
|
|
|
filterDrill: '',
|
|
|
|
|
filterBoards: '',
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
get UiOption()
|
|
|
|
@ -108,7 +110,13 @@ export class AutoHoleFaceSettingStore extends Singleton implements IConfigStore
|
|
|
|
|
conf.option.version = 1;
|
|
|
|
|
conf.option.filterDrill = '';
|
|
|
|
|
}
|
|
|
|
|
if (conf.option.version < 2)
|
|
|
|
|
{
|
|
|
|
|
conf.option.version = 2;
|
|
|
|
|
conf.option.filterBoards = '';
|
|
|
|
|
}
|
|
|
|
|
this.option.filterDrill = conf.option.filterDrill;
|
|
|
|
|
this.option.filterBoards = conf.option.filterBoards;
|
|
|
|
|
if (this.uiOption)
|
|
|
|
|
Object.assign(this.uiOption, DataAdapter.ConvertUIData(conf.option));
|
|
|
|
|
}
|
|
|
|
|