Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

!2305 option接口分类

Browse Source 
Merge pull request !2305 from 林三/file_classify
pull/2307/head
林三 1 year ago committed by ChenX
parent 2e316e045e
commit aa9c7874c1
201 changed files with 968 additions and 882 deletions
Show Stats Download Patch File Download Diff File

2
__test__/Door/door.test.ts
Unescape View File

@ -2,7 +2,7 @@ import { IsDoor } from "../../src/Add-on/HideSelect/HideSelectUtils";
import { CADFiler } from "../../src/DatabaseServices/CADFiler";
import { Database } from "../../src/DatabaseServices/Database";
import { Board } from "../../src/DatabaseServices/Entity/Board";
import { BoardOpenDir } from "../../src/UI/Store/BoardInterface";
import { BoardOpenDir } from "../../src/DatabaseServices/Entity/BoardInterface";
import { LoadBoardsFromFileData } from "../Utils/LoadEntity.util";
LoadBoardsFromFileData;

2
__test__/EdgeSealing/SmoothEdge.test.ts
Unescape View File

@ -1,6 +1,6 @@
import { SetSmoothEdges } from "../../src/Add-on/SetSmoothEdge/SetSmoothEdgeFace";
import { Board } from "../../src/DatabaseServices/Entity/Board";
import { ISmoothEdgeOption } from "../../src/UI/Store/BoardInterface";
import { ISmoothEdgeOption } from "../../src/UI/Store/OptionInterface/IOptionInterface";
import { LoadBoardsFromFileData } from "../Utils/LoadEntity.util";
describe("见光面封边测试", () =>

2
src/Add-on/ActivityLayerBoard.ts
Unescape View File

@ -2,6 +2,7 @@ import { Intent } from "@blueprintjs/core";
import { app } from "../ApplicationServices/Application";
import { Log, LogType } from "../Common/Log";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { RemoveTemplate } from "../DatabaseServices/Template/TempateUtils";
import { TemplateRecord } from "../DatabaseServices/Template/TemplateRecord";
import { Command } from "../Editor/CommandMachine";
@ -10,7 +11,6 @@ import { ActivityLayerBoard } from "../UI/Components/Modal/ActivityLayerBoard";
import { ModalState } from "../UI/Components/Modal/ModalInterface";
import { AppToaster } from "../UI/Components/Toaster";
import { ActivityLayerBoardStore } from "../UI/Store/ActivityLayerBoardStore";
import { BoardType } from "../UI/Store/BoardInterface";
import { activityLayerBoardTool } from "./DrawBoard/ActivityLayerBoardTool";
export class ActicityLayerBoard implements Command

2
src/Add-on/Array.ts
Unescape View File

@ -18,7 +18,7 @@ import { AsVector2, MoveMatrix, rotatePoint } from '../Geometry/GeUtils';
import { ArrayModal } from '../UI/Components/Modal/ArrayModal';
import { ModalPosition, ModalState } from '../UI/Components/Modal/ModalInterface';
import { AppToaster } from '../UI/Components/Toaster';
import { IBaseOption, IUiOption } from '../UI/Store/BoardInterface';
import { IBaseOption, IUiOption } from "../UI/Store/OptionInterface/IOptionInterface";
export enum ArrayType
{

3
src/Add-on/AutoHoleFaceSetting.ts
Unescape View File

@ -2,13 +2,14 @@ import { app } from "../ApplicationServices/Application";
import { EBoardKeyList } from "../Common/BoardKeyList";
import { LogType } from "../Common/Log";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { BoardModalType } from "../UI/Components/Board/BoardModalType";
import { IConfigOption } from "../UI/Components/Board/UserConfigComponent";
import { BoardType, FaceDirection } from "../UI/Store/BoardInterface";
import { IConfigStore } from "../UI/Store/BoardStore";
import { userConfigStore } from "../UI/Store/UserConfigStore";
import { FaceDirection } from "./DrawDrilling/DrillType";
export class AutoHoleFaceSetting implements Command
{

3
src/Add-on/BatchModifyPanel.ts
Unescape View File

@ -3,12 +3,13 @@ import { Matrix4, Vector3 } from "three";
import { app } from "../ApplicationServices/Application";
import { safeEval } from "../Common/eval";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { BatchModifyPanelModal, BatchModifyPanelStore } from "../UI/Components/BatchModifyPanelModal";
import { ModalState } from "../UI/Components/Modal/ModalInterface";
import { AppToaster } from "../UI/Components/Toaster";
import { BoardType, RadioType } from "../UI/Store/BoardInterface";
import { RadioType } from "../UI/Store/OptionInterface/OptionEnum";
export class BatchModifyPanel implements Command
{

3
src/Add-on/BoardBatchCurtail.ts
Unescape View File

@ -2,13 +2,14 @@ import { Box3, Euler, MathUtils, Vector3 } from "three";
import { app } from "../ApplicationServices/Application";
import { CylinderHole } from "../DatabaseServices/3DSolid/CylinderHole";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { IntersectBox2 } from "../Geometry/Box";
import { ZeroVec, equalv3, isParallelTo } from "../Geometry/GeUtils";
import { BoardBatchCurtailModal, BoardBatchCurtailStore } from "../UI/Components/BoardBatchCurtailModal";
import { ModalState } from "../UI/Components/Modal/ModalInterface";
import { BoardType, CurtailType } from "../UI/Store/BoardInterface";
import { CurtailType } from "../UI/Store/OptionInterface/BoardBatchCurtailOption ";
interface CurtailDataItem
{

2
src/Add-on/BoardCutting/CuttingPropsModal.tsx
Unescape View File

@ -4,7 +4,7 @@ import React, { ReactElement } from 'react';
import { app } from '../../ApplicationServices/Application';
import { CheckObjectType } from '../../Common/CheckoutVaildValue';
import { ToasterInput } from '../../UI/Components/Toaster';
import { IGrooveOption } from '../../UI/Store/BoardInterface';
import { IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface";
interface Props
{

2
src/Add-on/BoardCutting/NonAssociativeCutting.ts
Unescape View File

@ -9,7 +9,7 @@ import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/Hardwar
import { Command } from "../../Editor/CommandMachine";
import { PromptSsgetResult, PromptStatus } from "../../Editor/PromptResult";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { IGrooveOption } from "../../UI/Store/BoardInterface";
import { IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import CuttingPropsModal from "./CuttingPropsModal";
import { CuttingBoardByBoard, CuttingBoardByHardware } from "./CuttingUtils2";

4
src/Add-on/BoardCutting/ReferenceCutting.ts
Unescape View File

@ -1,15 +1,15 @@
import { app } from "../../ApplicationServices/Application";
import { InteractionLog, LogType } from "../../Common/Log";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Line } from "../../DatabaseServices/Entity/Line";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { equaln, ZeroVec } from "../../Geometry/GeUtils";
import { ZeroVec, equaln } from "../../Geometry/GeUtils";
import { RegionParse } from "../../Geometry/RegionParse";
import { IntersectOption } from "../../GraphicsSystem/IntersectWith";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { BoardType } from "../../UI/Store/BoardInterface";
import { CuttingOffset, ReferenceCuttingModal, ReferenceCuttingStore } from "./ReferenceCuttingModal";
export class ReferenceCutting implements Command

5
src/Add-on/BoardCutting/ReferenceCuttingModal.tsx
Unescape View File

@ -6,13 +6,14 @@ import { begin } from "xaop";
import { app } from "../../ApplicationServices/Application";
import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue";
import { DataAdapter } from "../../Common/DataAdapter";
import { safeEval } from "../../Common/eval";
import { KeyBoard } from "../../Common/KeyEnum";
import { Singleton } from "../../Common/Singleton";
import { safeEval } from "../../Common/eval";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { GetCompoentObjectIdString } from "../../UI/Components/ComponentObjectId";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { AppToaster, ToasterInput } from "../../UI/Components/Toaster";
import { BoardType, IBaseOption } from "../../UI/Store/BoardInterface";
import { IBaseOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export enum CuttingOffset
{

2
src/Add-on/BoardEditor/ChangeBoardColorByPBFace.ts
Unescape View File

@ -2,10 +2,10 @@ import { Intent } from "@blueprintjs/core";
import { app } from "../../ApplicationServices/Application";
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { Board } from "../../DatabaseServices/Entity/Board";
import { ComposingType } from "../../DatabaseServices/Entity/BoardInterface";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { AppToaster } from "../../UI/Components/Toaster";
import { ComposingType } from "../../UI/Store/BoardInterface";
export class Command_ChangeBoardColorByPBFace implements Command
{

4
src/Add-on/BoardEditor/SelectThinBehindBoard.ts
Unescape View File

@ -2,11 +2,11 @@ import { app } from "../../ApplicationServices/Application";
import { LogType } from "../../Common/Log";
import { FixedNotZero } from "../../Common/Utils";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { BoardType } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { userConfigStore } from "../../UI/Store/UserConfigStore";
@ -49,7 +49,7 @@ export class SelectThinBehindBoard implements Command
{
if (ret.Distance <= 0 || isNaN(ret.Distance))
{
app.Editor.Prompt("请输入为正数的厚度!", LogType.Error);
app.Editor.Prompt("请输入为正数的厚度!", LogType.Error);
return;
}
this.store.config.option.thickness = Math.abs(ret.Distance);

2
src/Add-on/BoardEditor/SerializeBoardData.ts
Unescape View File

@ -3,7 +3,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList";
import { CADFiler } from "../../DatabaseServices/CADFiler";
import { I2DModeling, I3DModeling, IPathItem } from "../../DatabaseServices/Entity/Board";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { BoardProcessOption } from "../../UI/Store/BoardInterface";
import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption";
/**序列化板件数据 */
export function serializeBoardData(file: CADFiler, processData: BoardProcessOption)

2
src/Add-on/BoardEditor/SetBoardLines.ts
Unescape View File

@ -1,9 +1,9 @@
import { app } from "../../ApplicationServices/Application";
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { Board } from "../../DatabaseServices/Entity/Board";
import { ComposingType, LinesType } from "../../DatabaseServices/Entity/BoardInterface";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { ComposingType, LinesType } from "../../UI/Store/BoardInterface";
export class SetBoardLines implements Command
{

4
src/Add-on/BoardFindModify.ts
Unescape View File

@ -2,9 +2,9 @@ import { toJS } from "mobx";
import { app } from "../ApplicationServices/Application";
import { arrayLast } from "../Common/ArrayExt";
import { EBoardKeyList } from "../Common/BoardKeyList";
import { safeEval } from "../Common/eval";
import { UpdateDraw } from "../Common/Status";
import { FixedNotZero } from "../Common/Utils";
import { safeEval } from "../Common/eval";
import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole";
import { BoardIsLong, BoardIsShort } from "../DatabaseServices/BoardLinesReactor";
import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
@ -21,7 +21,7 @@ import { IHardwareType, Production } from "../Production/Product";
import BoardFindModifyModal from "../UI/Components/Board/BoardFindModify";
import { DRILL_KEYS, ECompareType, EFindType, IBoardFindOption, IFindCondition } from "../UI/Store/BoardFindInterface";
import { BoardFindStore } from "../UI/Store/BoardFindModifyStore";
import { DrillType } from "../UI/Store/BoardInterface";
import { DrillType } from "./DrawDrilling/DrillType";
import { ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from "./DrawDrilling/HoleUtils";
import { IsDoor } from "./HideSelect/HideSelectUtils";

2
src/Add-on/ChangeColorByBoard/CalcBrThicknessConfigStore.ts
Unescape View File

@ -1,8 +1,8 @@
import { observable, toJS } from "mobx";
import { DefaultChangeColorByBoardMaterialOption } from "../../Editor/DefaultConfig";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { ChangeColorByBoardMaterialOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { ChangeColorByBoardMaterialOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export class ChangeColorByBoardMaterialStore implements IConfigStore
{

2
src/Add-on/CommandFeeding.ts
Unescape View File

@ -12,7 +12,7 @@ import { userConfig } from "../Editor/UserConfig";
import { MoveMatrix, ZAxis, rotatePoint } from "../Geometry/GeUtils";
import { IBoardHoleInfo, IModelingData, ISpliteOrderData, Production } from "../Production/Product";
import { AppToaster } from "../UI/Components/Toaster";
import { FaceDirection } from "../UI/Store/BoardInterface";
import { FaceDirection } from "./DrawDrilling/DrillType";
//testm
export class FeedingCommand implements Command

4
src/Add-on/DrawBoard/ActivityLayerBoardTool.ts
Unescape View File

@ -9,9 +9,9 @@ import { Shape } from "../../DatabaseServices/Shape";
import { Raycast } from "../../Editor/PointPick";
import { BoardFaceType, BoardGetFace } from "../../Geometry/DrillParse/BoardGetFace";
import { Face } from "../../Geometry/DrillParse/Face";
import { angleTo, AsVector2, equaln, equalv3, isParallelTo, MoveMatrix } from "../../Geometry/GeUtils";
import { AsVector2, MoveMatrix, angleTo, equaln, equalv3, isParallelTo } from "../../Geometry/GeUtils";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { INailRule, IShinkOption, LayerNailOption } from "../../UI/Store/BoardInterface";
import { INailRule, IShinkOption, LayerNailOption } from "../../UI/Store/OptionInterface/IOptionInterface";
class ActivityLayerBoardTool
{

4
src/Add-on/DrawBoard/BuildBoardTool.ts
Unescape View File

@ -2,11 +2,13 @@ import { Vector3 } from "three";
import { Log, LogType } from "../../Common/Log";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType, BrRelativePos } from "../../DatabaseServices/Entity/BoardInterface";
import { TemplateWineRackRecord } from "../../DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord";
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
import { MoveMatrix } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { BehindBoardOption, BehindHeightPositon, BoardType, BrRelativePos, IGrooveOption, LayerBoardOption, VerticalBoardOption } from "../../UI/Store/BoardInterface";
import { BehindBoardOption, IGrooveOption, LayerBoardOption, VerticalBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { BehindHeightPositon } from "../../UI/Store/OptionInterface/OptionEnum";
export function BuildLayerBoards(opt: LayerBoardOption, space: ISpaceParse, grooveOption?: IGrooveOption): Board[]
{

15
src/Add-on/DrawBoard/BuildLayerNailTool.ts
Unescape View File

@ -1,14 +1,15 @@
import { Intersection, Matrix4, Raycaster, Vector3 } from "three";
import { app } from "../../ApplicationServices/Application";
import { arrayLast } from "../../Common/ArrayExt";
import { GetEntity } from "../../Common/Utils";
import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole";
import { Board } from "../../DatabaseServices/Entity/Board";
import { LayerBoardOption, LayerNailOption, BoardType } from "../../UI/Store/BoardInterface";
import { Matrix4, Vector3, Raycaster, Intersection } from "three";
import { MoveMatrix, equalv3 } from "../../Geometry/GeUtils";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { ObjectId } from "../../DatabaseServices/ObjectId";
import { arrayLast } from "../../Common/ArrayExt";
import { MoveMatrix, equalv3 } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { app } from "../../ApplicationServices/Application";
import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { GetEntity } from "../../Common/Utils";
import { LayerBoardOption, LayerNailOption } from "../../UI/Store/OptionInterface/IOptionInterface";
enum NailPos
{
Left = 0,

3
src/Add-on/DrawBoard/BuildTopBottomBoardTool.ts
Unescape View File

@ -1,8 +1,9 @@
import { Vector3 } from "three";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { MoveMatrix } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { TBBoardOption, BoardType } from "../../UI/Store/BoardInterface";
import { TBBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export function BuildTopBottomBoards(topOpt: TBBoardOption, bottomOpt: TBBoardOption, space: ISpaceParse): Board[]
{

3
src/Add-on/DrawBoard/DrawBehindBoard.ts
Unescape View File

@ -1,9 +1,10 @@
import { app } from '../../ApplicationServices/Application';
import { BoardType } from '../../DatabaseServices/Entity/BoardInterface';
import { TemplateBehindBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateBehindBoard';
import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils';
import { JigUtils } from '../../Editor/JigUtils';
import { BehindBoardOption, BoardType } from '../../UI/Store/BoardInterface';
import { BehindBoardStore } from '../../UI/Store/BoardStore';
import { BehindBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { BuildBehindBoards } from './BuildBoardTool';
import { DrawBoardTool } from './DrawBoardTool';

2
src/Add-on/DrawBoard/DrawBoardTool.ts
Unescape View File

@ -1,5 +1,6 @@
import { app } from '../../ApplicationServices/Application';
import { CommandNames } from '../../Common/CommandNames';
import { BoardType } from '../../DatabaseServices/Entity/BoardInterface';
import { Command } from '../../Editor/CommandMachine';
import { PromptStatus } from '../../Editor/PromptResult';
import { ISpaceParse } from '../../Geometry/SpaceParse/ISpaceParse';
@ -7,7 +8,6 @@ import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpac
import { BoardModal } from '../../UI/Components/Board/BoardModal';
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { ModalPosition } from '../../UI/Components/Modal/ModalInterface';
import { BoardType } from '../../UI/Store/BoardInterface';
import { BehindBoardStore, LayerBoardStore, VerticalBoardStore } from '../../UI/Store/BoardStore';
import { AutoCutting } from '../BoardCutting/AutoCuttingReactor';

3
src/Add-on/DrawBoard/DrawClosingStrip.ts
Unescape View File

@ -6,6 +6,7 @@ import { app } from '../../ApplicationServices/Application';
import { EBoardKeyList } from '../../Common/BoardKeyList';
import { CommandNames } from '../../Common/CommandNames';
import { Board } from '../../DatabaseServices/Entity/Board';
import { BoardType, BrRelativePos, LinesType } from '../../DatabaseServices/Entity/BoardInterface';
import { Command } from '../../Editor/CommandMachine';
import { PromptStatus } from '../../Editor/PromptResult';
import { Box3Ext } from '../../Geometry/Box';
@ -15,8 +16,8 @@ import { BoardModal } from '../../UI/Components/Board/BoardModal';
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { ModalState } from '../../UI/Components/Modal/ModalInterface';
import { AppToaster } from '../../UI/Components/Toaster';
import { BoardType, BrRelativePos, LinesType, StripType } from '../../UI/Store/BoardInterface';
import { ClosingStripStore } from '../../UI/Store/BoardStore';
import { StripType } from "../../UI/Store/OptionInterface/ClosingStripOption";
import { AutoCutting } from '../BoardCutting/AutoCuttingReactor';
//补收口条默认宽度

4
src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts
Unescape View File

@ -6,6 +6,7 @@ import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { DuplicateRecordCloning } from "../../../Common/Status";
import { CADObject } from "../../../DatabaseServices/CADObject";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { BoardOpenDir, BoardType } from "../../../DatabaseServices/Entity/BoardInterface";
import { Entity } from '../../../DatabaseServices/Entity/Entity';
import { ExtrudeContourCurve } from "../../../DatabaseServices/Entity/Extrude";
import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity";
@ -19,10 +20,11 @@ import { Box3Ext } from "../../../Geometry/Box";
import { equaln, isParallelTo } from "../../../Geometry/GeUtils";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { AppToaster } from "../../../UI/Components/Toaster";
import { BoardOpenDir, BoardProcessOption, BoardType, DrillType } from "../../../UI/Store/BoardInterface";
import { DoorStore, IHingeRule, openDirTitle } from "../../../UI/Store/DoorDrawerStore/DoorStore";
import { DisableChangeParName, DoorOpenDir, HandleHorPos, HandleVePos, IDoorConfigOption, IDoorInfo } from "../../../UI/Store/DoorInterface";
import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProcessOption";
import { ITemplateParam } from "../../../UI/Store/RightPanelStore/ITemplateParam";
import { DrillType } from "../../DrawDrilling/DrillType";
import { IsDoor, IsHandle, IsHinge } from "../../HideSelect/HideSelectUtils";
const MoveNum = 8;

2
src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts
Unescape View File

@ -2,13 +2,13 @@ import { Intent } from "@blueprintjs/core";
import { app } from "../../../ApplicationServices/Application";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { BoardType } from "../../../DatabaseServices/Entity/BoardInterface";
import { ObjectId } from "../../../DatabaseServices/ObjectId";
import { TemplateSizeBoard } from "../../../DatabaseServices/Template/ProgramTempate/TemplateSizeBoard";
import { SetTemplatePositionAndSetParent } from "../../../DatabaseServices/Template/TempateUtils";
import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
import { TemplateSplitType } from "../../../DatabaseServices/Template/TemplateType";
import { AppToaster } from "../../../UI/Components/Toaster";
import { BoardType } from "../../../UI/Store/BoardInterface";
import { DoorOpenDir, IDoorInfo } from "../../../UI/Store/DoorInterface";
import { DrawDoorTool } from "./DrawDoorTool";

2
src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts
Unescape View File

@ -2,13 +2,13 @@ import { Intent } from "@blueprintjs/core";
import { app } from "../../../ApplicationServices/Application";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { BoardType } from "../../../DatabaseServices/Entity/BoardInterface";
import { ObjectId } from "../../../DatabaseServices/ObjectId";
import { TemplateSizeBoard } from "../../../DatabaseServices/Template/ProgramTempate/TemplateSizeBoard";
import { SetTemplatePositionAndSetParent } from "../../../DatabaseServices/Template/TempateUtils";
import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
import { TemplateSplitType } from "../../../DatabaseServices/Template/TemplateType";
import { AppToaster } from "../../../UI/Components/Toaster";
import { BoardType } from "../../../UI/Store/BoardInterface";
import { DoorOpenDir, IDoorInfo } from "../../../UI/Store/DoorInterface";
import { DrawDoorTool } from "./DrawDoorTool";

2
src/Add-on/DrawBoard/DrawDrawer.ts
Unescape View File

@ -7,6 +7,7 @@ import { DuplicateRecordCloning } from "../../Common/Status";
import { FixedNotZero } from "../../Common/Utils";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
import { ObjectId } from "../../DatabaseServices/ObjectId";
@ -22,7 +23,6 @@ import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { PointSelectSpaceClamp } from "../../Geometry/SpaceParse/PointSelectSpaceClamp";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { DoorModal } from "../../UI/Components/Board/Door/DoorModal";
import { BoardType } from "../../UI/Store/BoardInterface";
import { DrawerStore } from "../../UI/Store/DoorDrawerStore/DrawerStore";
import { DisableChangeParName, HandleHorPos, HandleVePos, IDrawerConfigOption, IDrawerInfo } from "../../UI/Store/DoorInterface";
import { ITemplateParam } from "../../UI/Store/RightPanelStore/ITemplateParam";

2
src/Add-on/DrawBoard/DrawLayerBoard.ts
Unescape View File

@ -2,8 +2,8 @@ import { app } from '../../ApplicationServices/Application';
import { TemplateLayerBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateLayerBoard';
import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils';
import { JigUtils } from '../../Editor/JigUtils';
import { LayerBoardOption } from '../../UI/Store/BoardInterface';
import { LayerBoardStore } from '../../UI/Store/BoardStore';
import { LayerBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { BuildLayerBoards } from './BuildBoardTool';
import { DrawBoardTool } from './DrawBoardTool';

5
src/Add-on/DrawBoard/DrawLeftRightBoard.ts
Unescape View File

@ -5,6 +5,7 @@ import { Log, LogType } from '../../Common/Log';
import { TransformVector } from '../../Common/Matrix4Utils';
import { GetEntity } from '../../Common/Utils';
import { Board } from '../../DatabaseServices/Entity/Board';
import { BoardType } from '../../DatabaseServices/Entity/BoardInterface';
import { RoomBase } from '../../DatabaseServices/Room/Entity/RoomBase';
import { TemplateLeftRightBoardRecord } from '../../DatabaseServices/Template/ProgramTempate/TemplateLeftRightBoardRecord';
import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils';
@ -13,12 +14,12 @@ import { JigUtils } from '../../Editor/JigUtils';
import { PromptPointResult, PromptStatus } from '../../Editor/PromptResult';
import { ParsePlaceEntitys } from '../../Editor/TranstrolControl/ParsePlaceEntitys';
import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos';
import { equalv3, ZeroVec } from '../../Geometry/GeUtils';
import { ZeroVec, equalv3 } from '../../Geometry/GeUtils';
import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpaceClamp';
import { BoardModal } from '../../UI/Components/Board/BoardModal';
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { AnyObject, BoardType } from '../../UI/Store/BoardInterface';
import { SideBoardStore } from '../../UI/Store/BoardStore';
import { AnyObject } from "../../UI/Store/OptionInterface/IOptionInterface";
import { AutoCutting } from '../BoardCutting/AutoCuttingReactor';
export class DrawLeftRight implements Command

4
src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts
Unescape View File

@ -1,14 +1,14 @@
import { Matrix4 } from "three";
import { app } from "../../ApplicationServices/Application";
import { safeEval } from "../../Common/eval";
import { LogType } from "../../Common/Log";
import { FixedNotZero } from "../../Common/Utils";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { Command } from "../../Editor/CommandMachine";
import { SpecialShapeBoardModal } from "../../UI/Components/Board/SpecialBoardModal";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { BoardType } from "../../UI/Store/BoardInterface";
import { SpecialShapeStore } from "../../UI/Store/BoardStore";
import { ExtrudeApplyContour, SelectExtrudeContours } from "./DrawSpecialShapeBoardTool";

2
src/Add-on/DrawBoard/DrawTemplateByImport.ts
Unescape View File

@ -8,6 +8,7 @@ import { PostJson, RequestStatus } from "../../Common/Request";
import { DuplicateRecordCloning } from "../../Common/Status";
import { AlignedDimension } from "../../DatabaseServices/Dimension/AlignedDimension";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Entity } from "../../DatabaseServices/Entity/Entity";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { GetOnlineTemplate } from "../../DatabaseServices/Template/TempateUtils";
@ -16,7 +17,6 @@ import { Text } from "../../DatabaseServices/Text/Text";
import { Command, CommandWrap } from "../../Editor/CommandMachine";
import { PromptResult } from "../../Editor/PromptResult";
import { AppToaster } from "../../UI/Components/Toaster";
import { BoardType } from "../../UI/Store/BoardInterface";
interface IList

3
src/Add-on/DrawBoard/DrawVerticalBoard.ts
Unescape View File

@ -1,8 +1,9 @@
import { app } from '../../ApplicationServices/Application';
import { BoardType } from '../../DatabaseServices/Entity/BoardInterface';
import { TemplateVerticalBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard';
import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils';
import { JigUtils } from '../../Editor/JigUtils';
import { BoardType, VerticalBoardOption } from '../../UI/Store/BoardInterface';
import { VerticalBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { BuildVerticalBoards } from './BuildBoardTool';
import { DrawBoardTool } from './DrawBoardTool';

2
src/Add-on/DrawBoard/EditorBoardTempate.ts
Unescape View File

@ -12,8 +12,8 @@ import { Command } from "../../Editor/CommandMachine";
import { BoardModal } from "../../UI/Components/Board/BoardModal";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { BoardConfigOption, SideBoardOption } from "../../UI/Store/BoardInterface";
import { BehindBoardStore, BoardStore, LayerBoardStore, SideBoardStore, TopBottomBoardStore, VerticalBoardStore } from "../../UI/Store/BoardStore";
import { BoardConfigOption, SideBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export class EditorBoardTemplate implements Command
{

2
src/Add-on/DrawBoard/SetHoleType.ts
Unescape View File

@ -3,7 +3,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList";
import { Board } from "../../DatabaseServices/Entity/Board";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { DrillType } from "../../UI/Store/BoardInterface";
import { DrillType } from "../DrawDrilling/DrillType";
export class SetHoleNoneType implements Command
{

2
src/Add-on/DrawDim/AutoDimBrs.ts
Unescape View File

@ -1,6 +1,7 @@
import { Matrix4, Vector3 } from "three";
import { app } from "../../ApplicationServices/Application";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Entity } from "../../DatabaseServices/Entity/Entity";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
@ -9,7 +10,6 @@ import { PromptStatus } from "../../Editor/PromptResult";
import { MoveMatrix, ZeroVec, equalv3 } from "../../Geometry/GeUtils";
import { AutoDimBoardPanel } from "../../UI/Components/AutoDimBoard";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { BoardType } from "../../UI/Store/BoardInterface";
import { IsDoor, IsHandle, IsHinge } from "../HideSelect/HideSelectUtils";
import { autoDimBrsStore } from "./AutoDimBrsStore";
import { DimBoards } from "./DimBoards";

2
src/Add-on/DrawDim/AutoDimBrsStore.ts
Unescape View File

@ -2,8 +2,8 @@ import { observable, toJS } from "mobx";
import { DefaultAutoDimBrsOption } from "../../Editor/DefaultConfig";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { IAutoDimBrsOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { IAutoDimBrsOption } from "../../UI/Store/OptionInterface/AutoDimBrsOption";
import { userConfigStore } from "../../UI/Store/UserConfigStore";
export class AutoDimBrsStore implements IConfigStore

2
src/Add-on/DrawDim/DimBoards.ts
Unescape View File

@ -13,7 +13,7 @@ import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
import { AsVector2, ZAxis, equaln, equalnn, isParallelTo, isPerpendicularityTo, midPoint } from "../../Geometry/GeUtils";
import { GetObbFromOcsSize } from "../../Geometry/OBB/obb";
import { BoolOpeartionType } from "../../GraphicsSystem/BoolOperateUtils";
import { ForBoardNameType } from "../../UI/Store/BoardInterface";
import { ForBoardNameType } from "../../UI/Store/OptionInterface/AutoDimBrsOption";
import { TestDraw } from "../test/TestUtil";
const TEST_DRAW_CURVE = false;

2
src/Add-on/DrawDim/DimStyleStore.ts
Unescape View File

@ -2,8 +2,8 @@ import { action, observable } from "mobx";
import { CADFiler } from "../../DatabaseServices/CADFiler";
import { ISerialize } from "../../DatabaseServices/ISerialize";
import { DefaultDimStyleOption } from "../../Editor/DefaultConfig";
import { IDimStyleOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { IDimStyleOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export class DimStyleStore implements IConfigStore, ISerialize
{

4
src/Add-on/DrawDim/OperDimStyle.tsx
Unescape View File

@ -4,13 +4,13 @@ import React, { Component } from "react";
import { begin } from "xaop";
import { app } from "../../ApplicationServices/Application";
import { KeyBoard } from "../../Common/KeyEnum";
import { Dimension } from "../../DatabaseServices/Dimension/Dimension";
import { DimStyleRecord } from "../../DatabaseServices/DimStyle/DimStyleRecord";
import { Dimension } from "../../DatabaseServices/Dimension/Dimension";
import { CommandWrap } from "../../Editor/CommandMachine";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent";
import { AppConfirm } from "../../UI/Components/Common/Confirm";
import { IDimStyleOption } from "../../UI/Store/BoardInterface";
import { IDimStyleOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { DEFAULT_STYLE_NAME, DimStylePanel } from "./DimStylePanel";
import { DimStyleParam } from "./DimStyleParam";
import { DimStyleStore, dimStyleStore } from "./DimStyleStore";

2
src/Add-on/DrawDrilling/DrawDrillingTool.ts
Unescape View File

@ -32,9 +32,9 @@ import { CollisionDetection } from "../../Geometry/DrillParse/CollisionDetection
import { Face } from "../../Geometry/DrillParse/Face";
import { MoveMatrix, YAxis, ZAxis, equaln, isIntersect, isParallelTo } from "../../Geometry/GeUtils";
import { AppToaster } from "../../UI/Components/Toaster";
import { FaceDirection } from "../../UI/Store/BoardInterface";
import { DownPanelStore } from "../../UI/Store/DownPanelStore";
import { DrillingOption, SpacingType } from "../../UI/Store/drillInterface";
import { FaceDirection } from "./DrillType";
import { CyHoleInBoard } from "./HoleUtils";
export class DrawDrillingTool extends Singleton

19
src/Add-on/DrawDrilling/DrillType.ts
Unescape View File

@ -0,0 +1,19 @@
/**
*勿随意更改属性名,若更改,需更改对应UI模态框的属性和检验方法的key
*
*/
//排钻类型
export enum DrillType
{
Yes = "排",
None = "不排",
More = "**多种**",
Invail = "无效配置"
}
//偏心轮类型
export enum FaceDirection
{
Front = 0,
Back = 1
}

4
src/Add-on/DrawDrilling/HoleUtils.ts
Unescape View File

@ -9,8 +9,8 @@ import { Circle } from "../../DatabaseServices/Entity/Circle";
import { Curve } from "../../DatabaseServices/Entity/Curve";
import { Line } from "../../DatabaseServices/Entity/Line";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { isParallelTo, rotatePoint, ZAxis } from "../../Geometry/GeUtils";
import { DrillType } from "../../UI/Store/BoardInterface";
import { ZAxis, isParallelTo, rotatePoint } from "../../Geometry/GeUtils";
import { DrillType } from "./DrillType";
export const SCALAR = 0.1;

2
src/Add-on/DrawViewport.ts
Unescape View File

@ -14,8 +14,8 @@ import { Box3Ext } from "../Geometry/Box";
import { RenderType } from "../GraphicsSystem/RenderType";
import { ModalState } from "../UI/Components/Modal/ModalInterface";
import { AppToaster } from "../UI/Components/Toaster";
import { ViewDirection, ViewportPosition } from "../UI/Store/BoardInterface";
import { DownPanelStore } from "../UI/Store/DownPanelStore";
import { ViewDirection, ViewportPosition } from "../UI/Store/OptionInterface/OptionEnum";
import { IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice } from "./HideSelect/HideSelectUtils";
import { Viewport2ConfigModal, Viewport2ConfigStore } from "./ViewortConfig/Viewport2Config";
import { Viewport3ConfigModal, Viewport3ConfigStore } from "./ViewortConfig/Viewport3Config";

6
src/Add-on/DrawWineRack/DrawObliqueWineRackTool.ts
Unescape View File

@ -2,13 +2,13 @@ import { Matrix4, Vector2, Vector3 } from "three";
import { arrayLast, arrayRemoveDuplicateBySort, arraySortByNumber } from "../../Common/ArrayExt";
import { MakeMirrorMtx } from "../../Common/Matrix4Utils";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Line } from "../../DatabaseServices/Entity/Line";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { AsVector2, equaln, equalv3, isParallelTo, MoveMatrix, polar, XAxis, YAxis, ZAxis } from "../../Geometry/GeUtils";
import { AsVector2, MoveMatrix, XAxis, YAxis, ZAxis, equaln, equalv3, isParallelTo, polar } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { IntersectOption } from "../../GraphicsSystem/IntersectWith";
import { BoardType } from "../../UI/Store/BoardInterface";
import { EFullDir, EFullType, EWineRackStyle, EWRackArrayType, IR2WROption, IWineRackOption } from "../../UI/Store/WineRackInterface";
import { EFullDir, EFullType, EWRackArrayType, EWineRackStyle, IR2WROption, IWineRackOption } from "../../UI/Store/WineRackInterface";
import { DrawWineRackTool, SIN45 } from "./DrawWinRackTool";
export interface IWineRackData

2
src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts
Unescape View File

@ -1,9 +1,9 @@
import { Vector3 } from "three";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { AsVector2, MoveMatrix } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { BoardType } from "../../UI/Store/BoardInterface";
import { EWRackArrayType, IWineRackOption } from "../../UI/Store/WineRackInterface";
import { DrawWineRackTool } from "./DrawWinRackTool";

6
src/Add-on/DrawWineRack/DrawWinRackTool.ts
Unescape View File

@ -1,11 +1,13 @@
import { Vector3 } from "three";
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { safeEval } from "../../Common/eval";
import { Singleton } from "../../Common/Singleton";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { BoardType, DrillType, FaceDirection, IHighSealedItem } from "../../UI/Store/BoardInterface";
import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem";
import { EFullDir, EFullType, EWRackArrayType, IWineRackOption } from "../../UI/Store/WineRackInterface";
import { DrillType, FaceDirection } from "../DrawDrilling/DrillType";
export const SIN45 = Math.sin(Math.PI / 4);

4
src/Add-on/Erp/ParseData.ts
Unescape View File

@ -4,6 +4,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList";
import { ConverCircleToPolyline } from "../../Common/CurveUtils";
import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole";
import { Board, I2DModeingItem } from "../../DatabaseServices/Entity/Board";
import { BoardOpenDir, LinesType } from "../../DatabaseServices/Entity/BoardInterface";
import { Circle } from "../../DatabaseServices/Entity/Circle";
import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
@ -14,7 +15,8 @@ import { AsVector2, GetBoxArr, ZeroVec, equalv3 } from "../../Geometry/GeUtils";
import { IContourData } from "../../Production/Convert2PtsBul";
import { I2DModeling, I3DContourData, I3DModeling, IDrillingOption, IHardwareType, IModelingData, ISpliteHardwareData, ISpliteOrderData, Production } from '../../Production/Product';
import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface";
import { BoardOpenDir, FaceDirection, ISealingData, LinesType } from "../../UI/Store/BoardInterface";
import { ISealingData } from "../../UI/Store/OptionInterface/IHighSealedItem";
import { FaceDirection } from "../DrawDrilling/DrillType";
// import { DownPanelStore } from "../../UI/Store/DownPanelStore";
import { InteractionLog, LogType } from "../../Common/Log";
import { Intent, Toaster } from "../../Common/Toaster";

2
src/Add-on/FZWL.ts
Unescape View File

@ -3,9 +3,9 @@
import { app } from "../ApplicationServices/Application";
import { EBoardKeyList } from "../Common/BoardKeyList";
import { Board } from "../DatabaseServices/Entity/Board";
import { LinesType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { LinesType } from "../UI/Store/BoardInterface";
export class Command_FZWL implements Command
{

2
src/Add-on/Gesture/Gesture_DrawLayerBoard.ts
Unescape View File

@ -2,13 +2,13 @@ import { Vector2, Vector3 } from "three";
import { app } from "../../ApplicationServices/Application";
import { LogType } from "../../Common/Log";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { CommandWrap } from "../../Editor/CommandMachine";
import { CommandState } from "../../Editor/CommandState";
import { GestureDir, GestureDirEqual } from "../../Editor/Gesture";
import { AsVector3, MoveMatrix } from "../../Geometry/GeUtils";
import { ClampSpaceParseRay } from "../../Geometry/SpaceParse/ClampSpaceParseRay";
import { PointSelectBoards } from "../../Geometry/SpaceParse/PointSelectBoards";
import { BoardType } from "../../UI/Store/BoardInterface";
export async function Gesture_DrawLayerBoard(dirs: GestureDir[], path: Vector2[])
{

2
src/Add-on/HideSelect/HideSelectUtils.ts
Unescape View File

@ -1,4 +1,5 @@
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardOpenDir, BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Entity } from "../../DatabaseServices/Entity/Entity";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { ProcessingGroupRecord } from "../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord";
@ -6,7 +7,6 @@ import { TemplateLatticeRecord } from "../../DatabaseServices/Template/ProgramTe
import { TemplateTopBottomBoard } from "../../DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard";
import { TemplateWineRackRecord } from "../../DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord";
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
import { BoardOpenDir, BoardType } from "../../UI/Store/BoardInterface";
export function IsDoor(en: Entity)
{

3
src/Add-on/JiaJu/Import/JiaJuImport.ts
Unescape View File

@ -10,6 +10,7 @@ import { Contour } from "../../../DatabaseServices/Contour";
import { Database } from "../../../DatabaseServices/Database";
import { Arc } from "../../../DatabaseServices/Entity/Arc";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { BoardType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface";
import { Entity } from "../../../DatabaseServices/Entity/Entity";
import { Line } from "../../../DatabaseServices/Entity/Line";
import { Polyline } from "../../../DatabaseServices/Entity/Polyline";
@ -21,8 +22,8 @@ import { Command, CommandWrap } from "../../../Editor/CommandMachine";
import { XAxis, YAxis, ZAxis, ZeroVec, equaln } from "../../../Geometry/GeUtils";
import { GetSealedBoardContour } from "../../../GraphicsSystem/CalcEdgeSealing";
import { AppToaster } from "../../../UI/Components/Toaster";
import { BoardType, FaceDirection, LinesType } from "../../../UI/Store/BoardInterface";
import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2";
import { FaceDirection } from "../../DrawDrilling/DrillType";
import { IBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from "../../DrawDrilling/HoleUtils";

2
src/Add-on/Join.ts
Unescape View File

@ -4,6 +4,7 @@ import { ComputerCurvesNormalOCS, curveLinkGroup } from "../Common/CurveUtils";
import { Status } from "../Common/Status";
import { Arc } from "../DatabaseServices/Entity/Arc";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Circle } from "../DatabaseServices/Entity/Circle";
import { Curve } from '../DatabaseServices/Entity/Curve';
import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude";
@ -15,7 +16,6 @@ import { PromptStatus } from "../Editor/PromptResult";
import { FuzzDirection } from "../Geometry/FuzzVector";
import { ComparePointFnGenerate, ptToString } from "../Geometry/GeUtils";
import { PlaneExt } from "../Geometry/Plane";
import { BoardType } from "../UI/Store/BoardInterface";
export class Command_Join implements Command
{

4
src/Add-on/KJL/Import/KJLImport.ts
Unescape View File

@ -10,6 +10,7 @@ import { DuplicateRecordCloning } from "../../../Common/Status";
import { Intent, ToasterShowEntityMsg } from "../../../Common/Toaster";
import { safeEval } from "../../../Common/eval";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { BoardType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface";
import { Entity } from "../../../DatabaseServices/Entity/Entity";
import { ExtrudeSolid } from "../../../DatabaseServices/Entity/Extrude";
import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity";
@ -25,10 +26,11 @@ import { ConverEachSeal2HightSealData, SetBoardTopDownLeftRightSealData } from "
import { BoardModalType } from "../../../UI/Components/Board/BoardModalType";
import { AppConfirm } from "../../../UI/Components/Common/Confirm";
import { AppToaster } from "../../../UI/Components/Toaster";
import { BoardType, DrillType, FaceDirection, IHighSealedItem, LinesType } from "../../../UI/Store/BoardInterface";
import { IHighSealedItem } from "../../../UI/Store/OptionInterface/IHighSealedItem";
import { TopPanelStore } from "../../../UI/Store/TopPanelStore";
import { EZengZhiBaoId, userConfigStore } from "../../../UI/Store/UserConfigStore";
import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2";
import { DrillType, FaceDirection } from "../../DrawDrilling/DrillType";
import { KJLUseName } from "../KJLImportConfig/KJLConfig";
import { DefaultKJImportOption, KJLImportConfigOption } from "../KJLImportConfig/KJLImportConfigOption";
import { KJLEdgeAndDrillParse } from "./KJLEdgeAndDrillParse";

6
src/Add-on/KJL/Import/KJLParse.ts
Unescape View File

@ -1,12 +1,12 @@
import { Vec2, Vector2 } from "three";
import { arrayLast, ArrayRemoveDupSavePre } from "../../../Common/ArrayExt";
import { ArrayRemoveDupSavePre, arrayLast } from "../../../Common/ArrayExt";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { FixIndex, ToFixed } from "../../../Common/Utils";
import { BoardOpenDir } from "../../../DatabaseServices/Entity/BoardInterface";
import { Polyline, PolylineProps } from "../../../DatabaseServices/Entity/Polyline";
import { HardwareTopline } from "../../../DatabaseServices/Hardware/HardwareTopline";
import { AsVector2, equalv2 } from "../../../Geometry/GeUtils";
import { BoardOpenDir } from "../../../UI/Store/BoardInterface";
import { KJL_AssemblyModel, KJL_DesignData, KJL_DrillData, KJL_LineType, KJL_Parameter, KJL_ParamModel, KJL_Path, KJL_Topline } from "./KJLInterface";
import { KJL_AssemblyModel, KJL_DesignData, KJL_DrillData, KJL_LineType, KJL_ParamModel, KJL_Parameter, KJL_Path, KJL_Topline } from "./KJLInterface";
import { KJLMaterialLoader } from "./KJLMaterialLoader";
import { ApplyMaterial } from "./KJLUtils";

2
src/Add-on/KJL/KJLImportConfig/KJLImportConfigOption.ts
Unescape View File

@ -1,4 +1,4 @@
import { IBaseOption, MaterialMapOption } from "../../../UI/Store/BoardInterface";
import { IBaseOption, MaterialMapOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import { KJLUseName } from "./KJLConfig";

2
src/Add-on/KJL/KJLImportConfig/KJLImportConfigStore.ts
Unescape View File

@ -7,8 +7,8 @@ import { Singleton } from "../../../Common/Singleton";
import { CADFiler } from "../../../DatabaseServices/CADFiler";
import { IConfigOption } from "../../../UI/Components/Board/UserConfigComponent";
import { AppToaster } from "../../../UI/Components/Toaster";
import { AnyObject, IUiOption } from "../../../UI/Store/BoardInterface";
import { IConfigStore } from "../../../UI/Store/BoardStore";
import { AnyObject, IUiOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import { KJLUseName } from "./KJLConfig";
import { DefaultKJImportOption, KJLImportConfigOption } from "./KJLImportConfigOption";
import { deserializeKJLConfigData, serializeKJLConfigData } from "./SerializeKJLConfigData";

2
src/Add-on/KJL/KjlExport.ts
Unescape View File

@ -11,6 +11,7 @@ import { ExtrudeHole } from "../../DatabaseServices/3DSolid/ExtrudeHole";
import { SweepSolid } from "../../DatabaseServices/3DSolid/SweepSolid";
import { Arc } from "../../DatabaseServices/Entity/Arc";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType, LinesType } from "../../DatabaseServices/Entity/BoardInterface";
import { Circle } from "../../DatabaseServices/Entity/Circle";
import { CompositeEntity } from "../../DatabaseServices/Entity/CompositeEntity";
import { Curve } from "../../DatabaseServices/Entity/Curve";
@ -23,7 +24,6 @@ import { PromptStatus } from "../../Editor/PromptResult";
import { GetEulerAngle, equalv3 } from "../../Geometry/GeUtils";
import { AppConfirm } from '../../UI/Components/Common/Confirm';
import { AppToaster } from "../../UI/Components/Toaster";
import { BoardType, LinesType } from "../../UI/Store/BoardInterface";
import { TopPanelStore } from '../../UI/Store/TopPanelStore';
import { EZengZhiBaoId } from '../../UI/Store/UserConfigStore';
import { HotCMD } from './../../Hot/HotCommand';

4
src/Add-on/LatticeDrawer/LatticeDrawerTool.ts
Unescape View File

@ -5,11 +5,13 @@ import { Log, LogType } from "../../Common/Log";
import { Singleton } from "../../Common/Singleton";
import { Arc } from "../../DatabaseServices/Entity/Arc";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { AsVector2, XAxis, YAxis, equalv3, isParallelTo } from "../../Geometry/GeUtils";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { BoardType, DrillType, IHighSealedItem } from "../../UI/Store/BoardInterface";
import { ELatticeArrayType, ILatticeOption } from "../../UI/Store/LatticeInterface";
import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem";
import { DrillType } from "../DrawDrilling/DrillType";
export class DrawLatticeDrawerTool extends Singleton
{

8
src/Add-on/LookOverBoardInfos/LookOverBoardInfos.ts
Unescape View File

@ -1,4 +1,5 @@
import { app } from "../../ApplicationServices/Application";
import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices";
import { LogType } from "../../Common/Log";
import { Board } from "../../DatabaseServices/Entity/Board";
import { Command } from "../../Editor/CommandMachine";
@ -19,12 +20,13 @@ export class LookOverBoardInfos implements Command
let switchDivisionChaiDan: null | boolean = null;
while (true)
{
let sealReserve = HostApplicationServices.sealReserve;
enRes = await app.Editor.GetSelection({
KeyWordList: [
{ msg: `${switchDivisionChaiDan ? "包括非拆单板" : "不包括非拆单板"}`, key: "S" },
{ msg: `修改封边统计留头量`, key: "L" }
],
Msg: `当前设置封边统计留头量 : ${bbsEditorStore.sealReserve},\n选择板件或者五金${switchDivisionChaiDan ? "(不包括非拆单板)" : "(包括非拆单板)"}`,
Msg: `当前设置封边统计留头量 : ${sealReserve},\n选择板件或者五金${switchDivisionChaiDan ? "(不包括非拆单板)" : "(包括非拆单板)"}`,
UseSelect: true,
Filter: {
filterFunction: (o, e) => e && e.Id &&
@ -40,14 +42,14 @@ export class LookOverBoardInfos implements Command
switchDivisionChaiDan = !switchDivisionChaiDan;
else if (enRes.StringResult === "L")
{
let ret = await app.Editor.GetDistance({ Msg: "当前设置封边统计留头量为:", Default: bbsEditorStore.sealReserve });
let ret = await app.Editor.GetDistance({ Msg: "当前设置封边统计留头量为:", Default: sealReserve });
if (ret.Status === PromptStatus.OK)
{
if (ret.Distance <= 0 || isNaN(ret.Distance))
{
app.Editor.Prompt("请输入为正数的留头量!", LogType.Warning);
}
bbsEditorStore.sealReserve = Math.abs(ret.Distance);
HostApplicationServices.sealReserve = Math.abs(ret.Distance);
userConfigStore.SaveConfig(BoardModalType.BBSEditor, bbsEditorStore, { toaster: false });
}
}

5
src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts
Unescape View File

@ -17,8 +17,7 @@ import { ProcessingGroupRecord } from '../../DatabaseServices/ProcessingGroup/Pr
import { equaln } from "../../Geometry/GeUtils";
import { GetSealedBoardContour } from "../../GraphicsSystem/CalcEdgeSealing";
import { IHardwareType, Production } from "../../Production/Product";
import { bbsEditorStore } from "../../UI/Store/BBSEditorStore";
import { ISealingData } from "../../UI/Store/BoardInterface";
import { ISealingData } from "../../UI/Store/OptionInterface/IHighSealedItem";
import { HoleInBoard } from "../DrawDrilling/HoleUtils";
export interface ICountType<T = IHardwareType>
@ -249,7 +248,7 @@ class LookOverBoardInfosTool
let color = br.BoardProcessOption[EBoardKeyList.Color];
//封边留头量
let sealReserve = bbsEditorStore.sealReserve * 2;
let sealReserve = HostApplicationServices.sealReserve * 2;
for (let data of sealData)
{

2
src/Add-on/OpenCabinet/OpenCabinet.ts
Unescape View File

@ -6,6 +6,7 @@ import { Log, LogType } from "../../Common/Log";
import { Hole } from "../../DatabaseServices/3DSolid/Hole";
import { Dimension } from "../../DatabaseServices/Dimension/Dimension";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardOpenDir } from "../../DatabaseServices/Entity/BoardInterface";
import { Curve } from "../../DatabaseServices/Entity/Curve";
import { Entity } from "../../DatabaseServices/Entity/Entity";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
@ -18,7 +19,6 @@ import { Box3Ext } from "../../Geometry/Box";
import { XAxis, ZAxis } from "../../Geometry/GeUtils";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { AppToaster } from "../../UI/Components/Toaster";
import { BoardOpenDir } from "../../UI/Store/BoardInterface";
import { IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice } from "../HideSelect/HideSelectUtils";
const MOVECOUNT = 150;

4
src/Add-on/RestoreColor.ts
Unescape View File

@ -1,8 +1,8 @@
import { Command } from "../Editor/CommandMachine";
import { app } from "../ApplicationServices/Application";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardOpenDir, BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { BoardType, BoardOpenDir } from "../UI/Store/BoardInterface";
export class Command_RestoreColor implements Command
{

4
src/Add-on/RotateLayerBoard.ts
Unescape View File

@ -2,14 +2,14 @@ import { MathUtils, Matrix4, Vector3 } from "three";
import { app } from "../ApplicationServices/Application";
import { CylinderHole } from "../DatabaseServices/3DSolid/CylinderHole";
import { Board } from "../DatabaseServices/Entity/Board";
import { BoardType } from "../DatabaseServices/Entity/BoardInterface";
import { Command } from "../Editor/CommandMachine";
import { PromptStatus } from "../Editor/PromptResult";
import { IntersectBox2 } from "../Geometry/Box";
import { equalv3, isParallelTo, MoveMatrix } from "../Geometry/GeUtils";
import { MoveMatrix, equalv3, isParallelTo } from "../Geometry/GeUtils";
import { ModalState } from "../UI/Components/Modal/ModalInterface";
import { ERotateType, RotateLayerBoardModal, RotateLayerBoardStore } from "../UI/Components/RotateLayerBoard";
import { AppToaster } from "../UI/Components/Toaster";
import { BoardType } from "../UI/Store/BoardInterface";
/** 计算前的板件相关数据接口 */
interface IOldBrData

3
src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts
Unescape View File

@ -8,7 +8,8 @@ import { BoardFaceType, BoardGetFace, GetSideFaceMtx } from "../../Geometry/Dril
import { Face } from "../../Geometry/DrillParse/Face";
import { equaln, equalv3 } from "../../Geometry/GeUtils";
import { GetBoardHighSeal, GetBoardSealingCurves, SetBoardTopDownLeftRightSealData } from "../../GraphicsSystem/CalcEdgeSealing";
import { IHighSealedItem, ISmoothEdgeOption } from "../../UI/Store/BoardInterface";
import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem";
import { ISmoothEdgeOption } from "../../UI/Store/OptionInterface/IOptionInterface";
class SetSmoothEdgeFaces extends BoardGetFace
{

2
src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts
Unescape View File

@ -1,8 +1,8 @@
import { observable, toJS } from "mobx";
import { DataAdapter } from "../../Common/DataAdapter";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { ISmoothEdgeOption, IUiOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { ISmoothEdgeOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
export class SmoothEdgeStore implements IConfigStore
{

2
src/Add-on/ShareView/ShareViewRules.ts
Unescape View File

@ -1,6 +1,6 @@
import { CommandNames } from "../../Common/CommandNames";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { ViewDirection } from "../../UI/Store/BoardInterface";
import { ViewDirection } from "../../UI/Store/OptionInterface/OptionEnum";
//仅在分享图纸shareView使用
export const ViewAngleTypes = [

2
src/Add-on/ShareView/ShareViewStore.ts
Unescape View File

@ -4,8 +4,8 @@ import { Singleton } from "../../Common/Singleton";
import { Board } from "../../DatabaseServices/Entity/Board";
import { DefaultShareBoardInfConfigurationOption } from "../../Editor/DefaultConfig";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { ShareBoardInfConfigurationOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from '../../UI/Store/BoardStore';
import { ShareBoardInfConfigurationOption } from "../../UI/Store/OptionInterface/IOptionInterface";
interface IProps
{

2
src/Add-on/ShareView/components/ViewAngle.tsx
Unescape View File

@ -1,6 +1,6 @@
import React, { forwardRef, useEffect, useRef, useState } from "react";
import { commandMachine } from "../../../Editor/CommandMachine";
import { ViewDirection } from "../../../UI/Store/BoardInterface";
import { ViewDirection } from "../../../UI/Store/OptionInterface/OptionEnum";
import { ViewAngleTypes } from "../ShareViewRules";
import { shareViewApp } from "../ShareViewService";
import { ForbiddenToaster, resetBoxView } from "../ShareViewUtil";

4
src/Add-on/Template/DrawVisualSpaceBox.tsx
Unescape View File

@ -16,13 +16,13 @@ import { JigUtils } from '../../Editor/JigUtils';
import { PromptPointResult, PromptStatus } from "../../Editor/PromptResult";
import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos';
import { VisualSpaceBox } from '../../Editor/VisualSpaceBox';
import { equalv3, ZeroVec } from '../../Geometry/GeUtils';
import { ZeroVec, equalv3 } from '../../Geometry/GeUtils';
import { GetCompoentObjectIdString } from '../../UI/Components/ComponentObjectId';
import { ModalState } from '../../UI/Components/Modal/ModalInterface';
import { ToasterInput } from '../../UI/Components/Toaster';
import { IBaseOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { DataAdapter } from './../../Common/DataAdapter';
import { AppToaster } from './../../UI/Components/Toaster';
import { IBaseOption, IUiOption } from './../../UI/Store/BoardInterface';
const VS_BOX_KEY = "vsBoxKey";

2
src/Add-on/TemplateSearch.tsx
Unescape View File

@ -15,7 +15,7 @@ import { AutoCutCheckbox } from '../UI/Components/Board/BoardCommon';
import { ModalFooter } from '../UI/Components/Modal/ModalContainer';
import { IGetRoomInfo } from '../UI/Components/Template/GetRoomCabName';
import { InsertTemplateByBasePoint } from '../UI/Components/Template/InsertTemplateByBasePoint';
import { IDrawBoardAutoCutOption } from '../UI/Store/BoardInterface';
import { IDrawBoardAutoCutOption } from "../UI/Store/OptionInterface/IOptionInterface";
import { CommonIframe } from './../UI/Components/Common/CommonIframe';
import { AutoCutting } from './BoardCutting/AutoCuttingReactor';

5
src/Add-on/ViewortConfig/Viewport2Config.tsx
Unescape View File

@ -9,9 +9,10 @@ import { DefaultViewport2ConfigOption } from "../../Editor/DefaultConfig";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { Viewport2ConfigOption, ViewportPosition } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions";
import { ViewportPosition } from "../../UI/Store/OptionInterface/OptionEnum";
import { Viewport2ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption";
import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions";
export class Viewport2ConfigStore implements IConfigStore
{

5
src/Add-on/ViewortConfig/Viewport3Config.tsx
Unescape View File

@ -9,9 +9,10 @@ import { DefaultViewport3ConfigOption } from "../../Editor/DefaultConfig";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { Viewport3ConfigOption, ViewportPosition } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions";
import { ViewportPosition } from "../../UI/Store/OptionInterface/OptionEnum";
import { Viewport3ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption";
import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions";
export class Viewport3ConfigStore implements IConfigStore
{

4
src/Add-on/ViewortConfig/Viewport4Config.tsx
Unescape View File

@ -9,9 +9,9 @@ import { DefaultViewport4ConfigOption } from "../../Editor/DefaultConfig";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { Viewport4ConfigOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions";
import { Viewport4ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption";
import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions";
export class Viewport4ConfigStore implements IConfigStore
{

4
src/Add-on/ViewortConfig/ViewportConfig.tsx
Unescape View File

@ -9,9 +9,9 @@ import { DefaultViewportConfigOption } from "../../Editor/DefaultConfig";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { ViewportConfigOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions";
import { ViewportConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption";
import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions";
export class ViewportConfigStore implements IConfigStore
{

2
src/Add-on/Viewport/OneKeyLayout.ts
Unescape View File

@ -32,8 +32,8 @@ import { RenderType } from "../../GraphicsSystem/RenderType";
import { FrameManage } from "../../UI/Components/Modal/FrameManager";
import { ModalState } from "../../UI/Components/Modal/ModalInterface";
import { AppToaster } from "../../UI/Components/Toaster";
import { ViewDirection } from "../../UI/Store/BoardInterface";
import { DownPanelStore } from "../../UI/Store/DownPanelStore";
import { ViewDirection } from "../../UI/Store/OptionInterface/OptionEnum";
import { TopPanelStore } from "../../UI/Store/TopPanelStore";
import { DrawCustomViewports, Get4Viewport, ICustomViewportInfo } from "../DrawViewport";
import { OneKeyLayoutStore } from "./OneKeyLayoutStore";

4
src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx
Unescape View File

@ -7,9 +7,9 @@ import { app } from "../../../ApplicationServices/Application";
import { CheckObjectType } from "../../../Common/CheckoutVaildValue";
import { CommandNames } from "../../../Common/CommandNames";
import { DataAdapter } from "../../../Common/DataAdapter";
import { safeEval } from "../../../Common/eval";
import { KeyBoard } from "../../../Common/KeyEnum";
import { Singleton } from "../../../Common/Singleton";
import { safeEval } from "../../../Common/eval";
import { DefaultCurve2RecOption } from "../../../Editor/DefaultConfig";
import { BoardModalType } from "../../../UI/Components/Board/BoardModalType";
import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../../UI/Components/Board/UserConfigComponent";
@ -17,8 +17,8 @@ import { GetCompoentObjectIdString } from "../../../UI/Components/ComponentObjec
import { ModalFooter, ModalHeader } from "../../../UI/Components/Modal/ModalContainer";
import { ModalState } from "../../../UI/Components/Modal/ModalInterface";
import { ToasterInput, ToasterValueError } from "../../../UI/Components/Toaster";
import { IUiOption } from "../../../UI/Store/BoardInterface";
import { IConfigStore } from "../../../UI/Store/BoardStore";
import { IUiOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import '../Modals/Curve2Rec.less';
import { Curve2RecOption } from "./Curve2RecOption";

3
src/Add-on/twoD2threeD/Modals/Curve2RecOption.tsx
Unescape View File

@ -1,5 +1,4 @@
import { IBaseOption } from "../../../UI/Store/BoardInterface";
import { IBaseOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
export interface Curve2RecOption extends IBaseOption
{

2
src/Add-on/twoD2threeD/ParseBoardData.ts
Unescape View File

@ -1,8 +1,8 @@
import { Box3, Matrix4, Vector3 } from "three";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { BoardGetFace } from "../../Geometry/DrillParse/BoardGetFace";
import { BoardType } from "../../UI/Store/BoardInterface";
export class ParseBoardData
{

2
src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx
Unescape View File

@ -12,7 +12,7 @@ import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { Config_ModalType } from "../../UI/Components/Board/UserConfigComponent";
import { CommonModal } from '../../UI/Components/Modal/ModalContainer';
import { AppToaster, ToasterInput } from "../../UI/Components/Toaster";
import { IUiOption } from '../../UI/Store/BoardInterface';
import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { ParseBoardNameStore } from './ParseBoardNameStore';
import { GetOptionState } from "./R2bConfigComponent";
import { IParseBoardNameOption } from './R2bInterface';

2
src/Add-on/twoD2threeD/ParseBoardNameStore.ts
Unescape View File

@ -3,8 +3,8 @@ import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue"
import { DataAdapter } from "../../Common/DataAdapter";
import { DefaultParseBoardNameOPtion } from "../../Editor/DefaultConfig";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { IUiOption } from "../../UI/Store/BoardInterface";
import { BoardStore } from "../../UI/Store/BoardStore";
import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { IParseBoardNameOption } from "./R2bInterface";
export class ParseBoardNameStore extends BoardStore<IParseBoardNameOption>

3
src/Add-on/twoD2threeD/ParseBoardNameUtil.ts
Unescape View File

@ -4,8 +4,9 @@ import { arrayRemoveIf } from "../../Common/ArrayExt";
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { LogType } from "../../Common/Log";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType, LinesType } from "../../DatabaseServices/Entity/BoardInterface";
import { ComparePointFnGenerate, equaln, isParallelTo } from "../../Geometry/GeUtils";
import { BoardType, DrillType, FaceDirection, LinesType } from "../../UI/Store/BoardInterface";
import { DrillType, FaceDirection } from "../DrawDrilling/DrillType";
import { IParseBoardNameOption } from "./R2bInterface";
/*解析板件名称 根据板件的位置.

2
src/Add-on/twoD2threeD/Polyline2Board.ts
Unescape View File

@ -8,6 +8,7 @@ import { DuplicateRecordCloning } from "../../Common/Status";
import { FixDigits } from "../../Common/Utils";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
import { PositioningBoardSpace } from "../../DatabaseServices/Template/Positioning/PositioningBoardSpace";
@ -21,7 +22,6 @@ import { HotCMD } from "../../Hot/HotCommand";
import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
import { IUpdateBoardInfosOption } from "../../UI/Components/Board/UpdateBoardInfointerface";
import { AppConfirm } from "../../UI/Components/Common/Confirm";
import { BoardType } from "../../UI/Store/BoardInterface";
import { TopPanelStore } from "../../UI/Store/TopPanelStore";
import { updateBoardInfoStore } from "../../UI/Store/UpdateBoardInfoStore";
import { userConfigStore } from "../../UI/Store/UserConfigStore";

2
src/Add-on/twoD2threeD/R2B2Store.ts
Unescape View File

@ -5,8 +5,8 @@ import { DataAdapter } from "../../Common/DataAdapter";
import { DefaultR2b2Option } from "../../Editor/DefaultConfig";
import { userConfig } from "../../Editor/UserConfig";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { IUiOption } from "../../UI/Store/BoardInterface";
import { IConfigStore } from "../../UI/Store/BoardStore";
import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { IRect2Br2Option } from "./R2bInterface";
export class R2B2Store implements IConfigStore

3
src/Add-on/twoD2threeD/R2bInterface.ts
Unescape View File

@ -1,6 +1,7 @@
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord";
import { DrillType, IBaseOption, IGrooveOption } from "../../UI/Store/BoardInterface";
import { IBaseOption, IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { DrillType } from "../DrawDrilling/DrillType";
export interface IParseBoardNameOption extends IBaseOption
{

2
src/Add-on/twoD2threeD/Rec2BrStore.ts
Unescape View File

@ -3,8 +3,8 @@ import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue"
import { DataAdapter } from "../../Common/DataAdapter";
import { DefaultR2bOption } from "../../Editor/DefaultConfig";
import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent";
import { IGrooveOption, IUiOption } from "../../UI/Store/BoardInterface";
import { BoardStore } from "../../UI/Store/BoardStore";
import { IGrooveOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface";
import { updateBoardInfoStore } from "../../UI/Store/UpdateBoardInfoStore";
import { IRec2BrOption } from "./R2bInterface";

7
src/Add-on/twoD2threeD/Rect2Board.ts
Unescape View File

@ -3,22 +3,23 @@ import { Box3, Matrix4, Object3D, Vector3 } from "three";
import { app } from "../../ApplicationServices/Application";
import { EBoardKeyList } from "../../Common/BoardKeyList";
import { IsRect } from "../../Common/CurveUtils";
import { safeEval } from "../../Common/eval";
import { Buy2To3 } from "../../Common/HostUrl";
import { Log, LogType } from "../../Common/Log";
import { FixDigits } from "../../Common/Utils";
import { safeEval } from "../../Common/eval";
import { Board } from "../../DatabaseServices/Entity/Board";
import { BoardType } from "../../DatabaseServices/Entity/BoardInterface";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
import { isParallelTo, XAxis, YAxis, ZAxis } from "../../Geometry/GeUtils";
import { XAxis, YAxis, ZAxis, isParallelTo } from "../../Geometry/GeUtils";
import { ClampSpaceParseRay } from "../../Geometry/SpaceParse/ClampSpaceParseRay";
import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
import { PointSelectBoards } from "../../Geometry/SpaceParse/PointSelectBoards";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { AppConfirm } from "../../UI/Components/Common/Confirm";
import { BoardType, FaceDirection } from "../../UI/Store/BoardInterface";
import { TopPanelStore } from "../../UI/Store/TopPanelStore";
import { FaceDirection } from "../DrawDrilling/DrillType";
import { R2b2Panel } from "./Modals/R2b2";
import { r2b2Store } from "./R2B2Store";
import { IRect2Br2Option } from "./R2bInterface";

1
src/ApplicationServices/HostApplicationServices.ts
Unescape View File

@ -23,6 +23,7 @@ export class IHostApplicationServices
@ProxyValue ConceptualOpacity = 1;//概念透明的透明度
DrawWallBottomFace = false;//绘制底面
sealReserve = 0; //封边统计留头量
private __ProxyObject__: any;//代理对象,当代理对象存在时,获取内部的值指向代理对象
static __ProxyKeys__: string[] = [];//代理对象,当代理对象存在时,获取内部的值指向代理对象

3
src/Common/CommonSelectOption.ts
Unescape View File

@ -1,4 +1,5 @@
import { ComposingType, LinesType, FaceDirection } from "../UI/Store/BoardInterface";
import { FaceDirection } from "../Add-on/DrawDrilling/DrillType";
import { ComposingType, LinesType } from "../DatabaseServices/Entity/BoardInterface";
/**排版面选择项 */
export const ComposingFaceSelectOption = [

2
src/Common/DataAdapter.ts
Unescape View File

@ -1,5 +1,5 @@
import { observable } from "mobx";
import { IUiOption } from "../UI/Store/BoardInterface";
import { IUiOption } from "../UI/Store/OptionInterface/IOptionInterface";
export class DataAdapter
{

2
src/DatabaseServices/BoardLinesReactor.ts
Unescape View File

@ -6,9 +6,9 @@ import { userConfig } from "../Editor/UserConfig";
import { Production } from "../Production/Product";
import { AppConfirm } from "../UI/Components/Common/Confirm";
import { AppToaster } from "../UI/Components/Toaster";
import { LinesType } from "../UI/Store/BoardInterface";
import { CADObject } from "./CADObject";
import { Board } from "./Entity/Board";
import { LinesType } from "./Entity/BoardInterface";
//禁止触发反应的命令
const ForbidReactorCmd = new Set([

5
src/DatabaseServices/Entity/Board.ts
Unescape View File

@ -1,6 +1,7 @@
import { Euler, FrontSide, Geometry, LineSegments, Matrix3, Matrix4, Mesh, Object3D, ShapeGeometry, Line as TLine, UVGenerator, Vector3 } from 'three';
import { Board2Regions } from '../../Add-on/BoardEditor/Board2Regions';
import { DeserializationBoard2DModeingData, DeserializationBoard3DModeingData, SerializeBoard2DModeingData, SerializeBoard3DModeingData, deserializationBoardData, serializeBoardData } from '../../Add-on/BoardEditor/SerializeBoardData';
import { DrillType, FaceDirection } from "../../Add-on/DrawDrilling/DrillType";
import { CyHoleInBoard, ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType, TempRectHoleOption } from '../../Add-on/DrawDrilling/HoleUtils';
import { HostApplicationServices } from '../../ApplicationServices/HostApplicationServices';
import { AddEntityDrawObject } from '../../Common/AddEntityDrawObject';
@ -17,7 +18,7 @@ import { PointShapeUtils } from '../../Geometry/PointShapeUtils';
import { GetBoardHighSeal, GetBoardSealingCurves, SetBoardTopDownLeftRightSealData } from '../../GraphicsSystem/CalcEdgeSealing';
import { RenderType } from '../../GraphicsSystem/RenderType';
import { VData2Curve, VKnifToolPath } from '../../GraphicsSystem/ToolPath/VKnifToolPath';
import { BoardOpenDir, BoardProcessOption, BoardType, ComposingType, DrillType, FaceDirection, LinesType } from '../../UI/Store/BoardInterface';
import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption";
import { CylinderHole } from '../3DSolid/CylinderHole';
import { ExtrudeHole } from '../3DSolid/ExtrudeHole';
import { AutoRecord } from '../AutoRecord';
@ -29,13 +30,13 @@ import { ObjectId } from '../ObjectId';
import { Shape } from '../Shape';
import { Text as DbText, TextAligen } from "../Text/Text";
import { Arc } from './Arc';
import { BoardOpenDir, BoardType, ComposingType, LinesType } from './BoardInterface';
import { Circle } from './Circle';
import { DragPointType } from './DragPointType';
import { Entity } from './Entity';
import { ExtrudeContourCurve, ExtrudeSolid } from './Extrude';
import { Polyline } from './Polyline';
//排钻配置名是合法的 可用的
function IsValidDriName(name: string): boolean
{

45
src/DatabaseServices/Entity/BoardInterface.ts
Unescape View File

@ -0,0 +1,45 @@
export enum BoardType
{
Layer = 0, //层板
Vertical = 1, //立板
Behind = 2 //背板
}
//纹路类型
export enum LinesType
{
/** 正纹 */
Positive = 0,
/** 反纹 */
Reverse = 1,
/** 可翻转 */
CanReversal = 2,
}
// 排版面
export enum ComposingType
{
Positive = 0, //正面
Reverse = 1, //反面
Arbitrary = 2 //任意
}
export enum BoardOpenDir
{
Left = 1,
Right = 2,
Up = 3,
Down = 4,
None = 0,
}
export enum BrRelativePos
{
Front = "front",
Back = "back",
Top = "top",
Bottom = "bottom",
Left = "left",
Right = "right",
Div = "div"
}

2
src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore.ts
Unescape View File

@ -1,9 +1,9 @@
import { observable, toJS } from "mobx";
import { DefaultWindowPanelOption as DefaultDoorWindowPanelOption } from "../../../../../../Editor/DefaultConfig";
import { IConfigOption } from "../../../../../../UI/Components/Board/UserConfigComponent";
import { WindowPanelConfigOption as DoorWindowPanelConfigOption } from "../../../../../../UI/Store/BoardInterface";
import { IConfigStore } from "../../../../../../UI/Store/BoardStore";
import { ISelectTempInfo } from "../../../../../../UI/Store/DoorInterface";
import { WindowPanelConfigOption as DoorWindowPanelConfigOption } from "../../../../../../UI/Store/OptionInterface/IOptionInterface";
import { TemplateWindowRecord } from "../../../../../Template/ProgramTempate/TemplateWindowRecord";
export enum DoorWindowParamsNames

4
src/DatabaseServices/Template/ProgramTempate/TemplateArcWindowRecord.ts
Unescape View File

@ -1,12 +1,12 @@
import { MathUtils, Matrix4, Vector3 } from "three";
import { equaln, ZAxis } from "../../../Geometry/GeUtils";
import { BoardType } from "../../../UI/Store/BoardInterface";
import { ZAxis, equaln } from "../../../Geometry/GeUtils";
import { AutoRecord } from "../../AutoRecord";
import { Factory } from "../../CADFactory";
import { CADFiler } from "../../CADFiler";
import { CADObject } from "../../CADObject";
import { Arc } from "../../Entity/Arc";
import { Board } from "../../Entity/Board";
import { BoardType } from "../../Entity/BoardInterface";
import { Line } from "../../Entity/Line";
import { Polyline } from "../../Entity/Polyline";
import { HardwareCompositeEntity } from "../../Hardware/HardwareCompositeEntity";

6
src/DatabaseServices/Template/ProgramTempate/TemplateBehindBoard.ts
Unescape View File

@ -1,10 +1,10 @@
import { BuildBehindBoards } from "../../../Add-on/DrawBoard/BuildBoardTool";
import { DefaultBehindBoardConfig } from "../../../Editor/DefaultConfig";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { BehindBoardOption, IGrooveOption } from "../../../UI/Store/BoardInterface";
import { BehindBoardOption, IGrooveOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import { Factory } from "../../CADFactory";
import { TemplateBoardRecord } from "./TemplateBoard";
import { DefaultBehindBoardConfig } from "../../../Editor/DefaultConfig";
import { CADFiler } from "../../CADFiler";
import { TemplateBoardRecord } from "./TemplateBoard";
/**
* 背板模板

3
src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts
Unescape View File

@ -1,7 +1,8 @@
import { ExtendsBoardThickness } from "../../../Add-on/DrawBoard/BuildBoardTool";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { BoardConfigOption, BoardProcessOption } from "../../../UI/Store/BoardInterface";
import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProcessOption";
import { BoardConfigOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import { AutoRecord } from "../../AutoRecord";
import { Factory } from "../../CADFactory";
import { CADFiler } from "../../CADFiler";

2
src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts
Unescape View File

@ -2,7 +2,7 @@ import { activityLayerBoardTool } from "../../../Add-on/DrawBoard/ActivityLayerB
import { BuildLayerBoards } from "../../../Add-on/DrawBoard/BuildBoardTool";
import { DefaultLayerBoardConfig, DefaultNailOption } from "../../../Editor/DefaultConfig";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { IGrooveOption, LayerBoardOption, LayerNailOption } from "../../../UI/Store/BoardInterface";
import { IGrooveOption, LayerBoardOption, LayerNailOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
import { Factory } from "../../CADFactory";
import { CADFiler } from "../../CADFiler";
import { Board } from "../../Entity/Board";

2
src/DatabaseServices/Template/ProgramTempate/TemplateSizeBoard.ts
Unescape View File

@ -1,7 +1,7 @@
import { Factory } from "../../CADFactory";
import { Board } from "../../Entity/Board";
import { BoardType } from "../../Entity/BoardInterface";
import { TemplateRecord } from "../TemplateRecord";
import { BoardType } from "../../../UI/Store/BoardInterface";
@Factory
export class TemplateSizeBoard extends TemplateRecord

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save