build-dxf 0.0.32 → 0.0.33

package/src/utils/DxfSystem/components/Dxf.d.ts

@@ -143,7 +143,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @param data
      */
     preprocessing(data: OriginalDataItem[], axisAlignmentCorrection?: boolean): {
-        lineSegments: (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
+        lineSegments: LineSegment<LineUserData>[];
         data: OriginalDataItem[];
     };
     /**
@@ -260,6 +260,17 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @param targettLine 轴线段
      * @returns
      */
-    static axisAlignmentCorrection(lines: LineSegment[], targettLine: LineSegment): (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
+    static axisAlignmentCorrection(lines: LineSegment[], targettLine: LineSegment): LineSegment<LineUserData>[];
+    /**
+     * @param lines
+     * @param trajectoryPositions
+     * @returns
+     */
+    static excessLineSegments(lines: LineSegment[], trajectoryPositions: Point[]): LineSegment<Record<string, any>>[];
+    /** 边线外扩
+     * @param lines
+     * @param trajectory
+     */
+    static boundaryExtension(lines: LineSegment<LineUserData>[], trajectory: Point[]): LineSegment<LineUserData>[];
 }
 export {};

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/CommandFlowComponent.d.ts

@@ -50,7 +50,7 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
      * @param callBack
      * @returns
      */
-    createPointerMove(callBack: (point: Point, isAdsorb: boolean) => void): {
+    createPointerMove(callBack: (point: Point, isAdsorb: boolean, line?: LineSegment) => void): {
         destroy(): void;
         setBaseLine(line: LineSegment | null, point: Point | null): void;
     };

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/MergeLine.d.ts

@@ -1,5 +1,6 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
 /**
  * 合并同向线段
  */
@@ -12,11 +13,12 @@ export declare class MergeLine extends CommandFlowComponent<{}> {
      * 进入命令约束
      */
     private constraint;
+    mergeLine(line1: LineSegment, line2: LineSegment): false | LineSegment<Record<string, any>>;
     /** 开始
      * @param next
      * @todo 合并所有
      */
-    private mergeLine;
+    private mergeLines;
     /** 执行完成
      * @param data
      */

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/VerticalCorrection.d.ts

@@ -11,10 +11,8 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     shortcutKeys: string[];
-    shortcutKeys2: string[];
     shortcutKeys3: string[];
     static commandName: string;
-    recursion: boolean;
     axisAlignment: boolean;
     onAddFromParent(parent: ComponentManager): void;
     /**
@@ -55,13 +53,18 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @returns
      */
     axisAlignmentCorrection(targettLine: LineSegment): {
-        newLines: (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
+        newLines: LineSegment<LineUserData>[];
         oldLines: LineSegment<LineUserData>[];
     };
     /** 开始
      * @param next
      */
     verticalCorrection(next: any, selectLines: LineSegment[]): void;
+    /**
+     * 窗户恢复
+     * @param doorLines
+     */
+    windowRecover(doorLines: LineSegment<LineUserData>[]): void;
     /** 执行完成
      * @param data
      */

package/src/utils/PointVirtualGrid/index.d.ts

@@ -1,12 +1,17 @@
 import { Box2 } from '../Quadtree/Box2';
 import { Point } from '../Quadtree/Point';
 import { Rectangle } from '../Quadtree/Rectangle';
-type NodeSet<T> = Set<{
+type Target<T> = {
     point: Point;
     userData?: T;
-}>;
+};
+type NodeSet<T> = Set<Target<T>>;
 export declare class PointVirtualGrid<T = Record<string, any>> {
     map: Map<string, NodeSet<T>>;
+    targetMap: Map<Point<Record<string, any>>, {
+        target: Target<T>;
+        set: NodeSet<T>;
+    }>;
     gridSize: number;
     constructor(gridSize?: number);
     /**

package/src/utils/Quadtree/Point.d.ts

@@ -1,3 +1,4 @@
+import { LineSegment } from './LineSegment';
 export declare class Point<T = Record<string, any>> {
     x: number;
     y: number;
@@ -85,6 +86,11 @@ export declare class Point<T = Record<string, any>> {
      * @returns
      */
     direction(point: Point): Point<Record<string, any>>;
+    /** 展开为线
+     * @param direction
+     * @param length
+     */
+    expandAsLine(direction: Point, length: number): LineSegment<Record<string, any>>;
     /**
      * 计算模长
      * @returns

package/src/utils/Quadtree/Quadtree.d.ts

@@ -49,6 +49,12 @@ export declare class Quadtree<T = any> {
      * @returns 相交的节点数组
      */
     queryCircle(pos: Point, radius: number): QuadtreeNode<T>[];
+    /**
+     * 查询与点相交的线段节点
+     * @param point 圆心
+     * @returns 相交的节点数组
+     */
+    queryPoint(point: Point): QuadtreeNode<T>[];
     /**
      * 查询与矩形相交的线段节点
      * @param rectangle 矩形