!1464 功能:可配置是否统计通孔

pull/1464/MERGE
ChenX 4 years ago
parent 9b6a96c20f
commit 41153a3a14

@ -10,6 +10,7 @@ import { Board } from "../../DatabaseServices/Entity/Board";
import { GroupRecord } from "../../DatabaseServices/GroupTableRecord"; import { GroupRecord } from "../../DatabaseServices/GroupTableRecord";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline"; import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
import { userConfig } from "../../Editor/UserConfig";
import { equaln } from "../../Geometry/GeUtils"; import { equaln } from "../../Geometry/GeUtils";
import { IHardwareType, Production } from "../../Production/Product"; import { IHardwareType, Production } from "../../Production/Product";
import { HoleInBoard } from "../DrawDrilling/HoleUtils"; import { HoleInBoard } from "../DrawDrilling/HoleUtils";
@ -177,11 +178,11 @@ class LookOverBoardInfosTool
if (spliteName && hole) if (spliteName && hole)
{ {
if (isTk) if (isTk && userConfig.chaidanOption.statTk)
{ {
addDrillToMap("通孔" + spliteName, hole); addDrillToMap("通孔" + spliteName, hole);
} }
else if (pxlCount === 2) else if (pxlCount === 2 && userConfig.chaidanOption.statSt)
{ {
addDrillToMap("双头" + spliteName, hole); addDrillToMap("双头" + spliteName, hole);
} }

@ -85,6 +85,8 @@ export class UserConfig implements IConfigStore
modeling2HoleRad: 20, //圆造型小于等于该值拆成孔数据 modeling2HoleRad: 20, //圆造型小于等于该值拆成孔数据
isCheckInterfere: false, isCheckInterfere: false,
noModeingData: "", //非造型遭数据 noModeingData: "", //非造型遭数据
statTk: false,//统计通孔排钻
statSt: false,//统计双头排钻
}; };
@observable autoLines = false; @observable autoLines = false;
dimTextHeight = 60; dimTextHeight = 60;

@ -80,6 +80,16 @@ export class ChaiDanPanel extends React.Component
checked={userConfig.chaidanOption.isCheckInterfere} checked={userConfig.chaidanOption.isCheckInterfere}
onChange={() => userConfig.chaidanOption.isCheckInterfere = !userConfig.chaidanOption.isCheckInterfere} onChange={() => userConfig.chaidanOption.isCheckInterfere = !userConfig.chaidanOption.isCheckInterfere}
/> />
<Checkbox
label="统计通孔排钻"
checked={userConfig.chaidanOption.statTk}
onChange={() => userConfig.chaidanOption.statTk = !userConfig.chaidanOption.statTk}
/>
<Checkbox
label="统计双头排钻"
checked={userConfig.chaidanOption.statSt}
onChange={() => userConfig.chaidanOption.statSt = !userConfig.chaidanOption.statSt}
/>
</Card> </Card>
); );
} }

Loading…
Cancel
Save