diff --git a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts index de6c654aa..c39df8a81 100644 --- a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts +++ b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts @@ -10,6 +10,7 @@ import { Board } from "../../DatabaseServices/Entity/Board"; import { GroupRecord } from "../../DatabaseServices/GroupTableRecord"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline"; +import { userConfig } from "../../Editor/UserConfig"; import { equaln } from "../../Geometry/GeUtils"; import { IHardwareType, Production } from "../../Production/Product"; import { HoleInBoard } from "../DrawDrilling/HoleUtils"; @@ -177,11 +178,11 @@ class LookOverBoardInfosTool if (spliteName && hole) { - if (isTk) + if (isTk && userConfig.chaidanOption.statTk) { addDrillToMap("通孔" + spliteName, hole); } - else if (pxlCount === 2) + else if (pxlCount === 2 && userConfig.chaidanOption.statSt) { addDrillToMap("双头" + spliteName, hole); } diff --git a/src/Editor/UserConfig.ts b/src/Editor/UserConfig.ts index d967888b5..5698d5e42 100644 --- a/src/Editor/UserConfig.ts +++ b/src/Editor/UserConfig.ts @@ -85,6 +85,8 @@ export class UserConfig implements IConfigStore modeling2HoleRad: 20, //圆造型小于等于该值拆成孔数据 isCheckInterfere: false, noModeingData: "", //非造型遭数据 + statTk: false,//统计通孔排钻 + statSt: false,//统计双头排钻 }; @observable autoLines = false; dimTextHeight = 60; diff --git a/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx b/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx index 07a5c8115..1dd5fbd7b 100644 --- a/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx +++ b/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx @@ -80,6 +80,16 @@ export class ChaiDanPanel extends React.Component checked={userConfig.chaidanOption.isCheckInterfere} onChange={() => userConfig.chaidanOption.isCheckInterfere = !userConfig.chaidanOption.isCheckInterfere} /> + userConfig.chaidanOption.statTk = !userConfig.chaidanOption.statTk} + /> + userConfig.chaidanOption.statSt = !userConfig.chaidanOption.statSt} + /> ); }