|
|
@ -2,11 +2,12 @@ import { toJS } from "mobx";
|
|
|
|
import { app } from "../ApplicationServices/Application";
|
|
|
|
import { app } from "../ApplicationServices/Application";
|
|
|
|
import { arrayLast } from "../Common/ArrayExt";
|
|
|
|
import { arrayLast } from "../Common/ArrayExt";
|
|
|
|
import { EBoardKeyList } from "../Common/BoardKeyList";
|
|
|
|
import { EBoardKeyList } from "../Common/BoardKeyList";
|
|
|
|
|
|
|
|
import { safeEval } from "../Common/eval";
|
|
|
|
import { FixedNotZero } from "../Common/Utils";
|
|
|
|
import { FixedNotZero } from "../Common/Utils";
|
|
|
|
import { GangDrill, GangDrillType } from "../DatabaseServices/3DSolid/GangDrill";
|
|
|
|
import { GangDrill, GangDrillType } from "../DatabaseServices/3DSolid/GangDrill";
|
|
|
|
import { Board } from "../DatabaseServices/Entity/Board";
|
|
|
|
|
|
|
|
import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
|
|
|
|
import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
|
|
|
|
import { AlignedDimension } from "../DatabaseServices/Dimension/AlignedDimension";
|
|
|
|
import { AlignedDimension } from "../DatabaseServices/Dimension/AlignedDimension";
|
|
|
|
|
|
|
|
import { Board } from "../DatabaseServices/Entity/Board";
|
|
|
|
import { Command } from "../Editor/CommandMachine";
|
|
|
|
import { Command } from "../Editor/CommandMachine";
|
|
|
|
import { PromptStatus } from "../Editor/PromptResult";
|
|
|
|
import { PromptStatus } from "../Editor/PromptResult";
|
|
|
|
import { SelectSetBase } from "../Editor/SelectBase";
|
|
|
|
import { SelectSetBase } from "../Editor/SelectBase";
|
|
|
@ -126,20 +127,20 @@ export class BoardFindModify implements Command
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
compareBrValue = br.Height;
|
|
|
|
compareBrValue = br.Height;
|
|
|
|
compareValue = parseFloat(option.height) || 0;
|
|
|
|
compareValue = safeEval(option.height) || 0;
|
|
|
|
torValue = parseFloat(option.tolerance.height) || 0;
|
|
|
|
torValue = safeEval(option.tolerance.height) || 0;
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.height);
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.height);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case EBoardKeyList.Width:
|
|
|
|
case EBoardKeyList.Width:
|
|
|
|
compareBrValue = br.Width;
|
|
|
|
compareBrValue = br.Width;
|
|
|
|
compareValue = parseFloat(option.width) || 0;
|
|
|
|
compareValue = safeEval(option.width) || 0;
|
|
|
|
torValue = parseFloat(option.tolerance.width) || 0;
|
|
|
|
torValue = safeEval(option.tolerance.width) || 0;
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.width);
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.width);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case EBoardKeyList.Thick:
|
|
|
|
case EBoardKeyList.Thick:
|
|
|
|
compareBrValue = br.Thickness;
|
|
|
|
compareBrValue = br.Thickness;
|
|
|
|
compareValue = parseFloat(option.thickness) || 0;
|
|
|
|
compareValue = safeEval(option.thickness) || 0;
|
|
|
|
torValue = parseFloat(option.tolerance.thickness) || 0;
|
|
|
|
torValue = safeEval(option.tolerance.thickness) || 0;
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.thickness);
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.thickness);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case "uerDoor":
|
|
|
|
case "uerDoor":
|
|
|
@ -240,17 +241,17 @@ export class BoardFindModify implements Command
|
|
|
|
switch (i as keyof EBoardKeyList)
|
|
|
|
switch (i as keyof EBoardKeyList)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
let height = parseFloat(option.height);
|
|
|
|
let height = safeEval(option.height);
|
|
|
|
if (height)
|
|
|
|
if (height)
|
|
|
|
br.Height = height;
|
|
|
|
br.Height = height;
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case EBoardKeyList.Width:
|
|
|
|
case EBoardKeyList.Width:
|
|
|
|
let width = parseFloat(option.width);
|
|
|
|
let width = safeEval(option.width);
|
|
|
|
if (width)
|
|
|
|
if (width)
|
|
|
|
br.Width = width;
|
|
|
|
br.Width = width;
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case EBoardKeyList.Thick:
|
|
|
|
case EBoardKeyList.Thick:
|
|
|
|
let thickness = parseFloat(option.thickness);
|
|
|
|
let thickness = safeEval(option.thickness);
|
|
|
|
if (thickness)
|
|
|
|
if (thickness)
|
|
|
|
br.Thickness = thickness;
|
|
|
|
br.Thickness = thickness;
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|