build-dxf 0.0.50 → 0.0.52

package/src/utils/Box2.d.ts

@@ -92,5 +92,5 @@ export declare class Box2 {
      * @param points
      * @returns
      */
-    static fromByLineSegment(...lines: LineSegment[]): Box2;
+    static fromByLineSegment<T = any>(...lines: LineSegment<T>[]): Box2;
 }

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

@@ -3,6 +3,7 @@ import { AngleCorrectionDxf } from './components/AngleCorrectionDxf';
 import { DoorsAnalysisComponent } from './components/DoorsAnalysis';
 import { Dxf } from './components/Dxf';
 import { LineAnalysis } from './components/LineAnalysis';
+import { ThreeVJia } from './components/ThreeVJia';
 import { Variable } from './components/Variable';
 export declare class DxfSystem extends ComponentManager {
     Dxf: Dxf;
@@ -21,3 +22,12 @@ export declare class DxfSystem extends ComponentManager {
     usePlugin(plugin: (this: DxfSystem, dxfSystem: DxfSystem) => void): this;
     destroy(): void;
 }
+declare const components: {
+    LineAnalysis: typeof LineAnalysis;
+    ThreeVJia: typeof ThreeVJia;
+    Variable: typeof Variable;
+    Dxf: typeof Dxf;
+    DoorsAnalysisComponent: typeof DoorsAnalysisComponent;
+    AngleCorrectionDxf: typeof AngleCorrectionDxf;
+};
+export { components };

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

@@ -1,7 +1,7 @@
 import { Component } from '../../ComponentManager';
 import { LineSegment } from '../../LineSegment';
 import { LineUserData } from '../type';
-import { ArrayMap } from '../../Map';
+import { ThreeVJiaJsonObject } from '../utils/lineDataToThreeVJiaJson';
 /**
  * 转为 三维家 墙体结构
  */
@@ -14,54 +14,16 @@ export declare class ThreeVJia extends Component<{
     /**
      */
     onAddFromParent(): void;
-    /** 获取分组
-     * @param lines
-     * @returns
-     */
-    getGroups(lines: LineSegment<LineUserData>[]): ArrayMap<string, LineSegment<Record<string, any>>> | null;
+    private cacheJson?;
     /** 更新
      */
     updateData(): void;
-    /** 处理有分组
-     * @param map
-     */
-    handleGroup(map: ArrayMap<string, LineSegment<LineUserData>>): void;
-    /**
-     * 角度纠正
-     */
-    angleCorrection(): void;
-    /**
-     * 处理没有分组
+    /** 转为json
+     * @param name
+     * @param communityName
+     * @returns
      */
-    handle(): void;
-    toJson(): {
-        version: string;
-        name: string;
-        communityName: string;
-        city: string;
-        province: string;
-        height: number;
-        walls: {
-            ID: number;
-            start: {
-                x: number;
-                y: number;
-            };
-            end: {
-                x: number;
-                y: number;
-            };
-            thickness: number;
-            type: string;
-            isDoor: boolean | undefined;
-            loadBearingWall: boolean;
-            height: number;
-        }[];
-        pillars: never[];
-        beams: never[];
-        holes: any[];
-        rooms: never[];
-    };
+    toJson(name?: string, communityName?: string): ThreeVJiaJsonObject | undefined;
     /**
      * 下载
      * @param filename

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

@@ -1,2 +1,2 @@
 export * from './DxfSystem';
-export * as utils from './utils';
+export * from './utils';

package/src/utils/DxfSystem/plugin/Editor/index.d.ts

@@ -1,4 +1,5 @@
 import { DxfSystem } from '../../DxfSystem';
+export * as components from './components';
 type Option = {
     viewPermission?: "admin";
 };

package/src/utils/DxfSystem/utils/BoundExt.d.ts

@@ -1,6 +1,20 @@
 import { LineSegment } from '../../LineSegment';
 import { Point } from '../../Point';
 import { LineUserData, OriginalDataItem } from '../type';
+interface IByTraj {
+    lines: LineSegment[];
+    trajectory: any;
+    wallWidth: number;
+    updateDoubleWallGroup?: boolean;
+    findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void;
+}
+interface IByTrajAnOriginData {
+    data: OriginalDataItem[];
+    trajectory: any;
+    wallWidth: number;
+    updateDoubleWallGroup?: boolean;
+    findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void;
+}
 export declare class BoundExt {
     /** 通过轨迹点查找外墙
      * @param lines
@@ -16,5 +30,17 @@ export declare class BoundExt {
      * @param lines
      * @param trajectoryPoints
      */
-    static boundExtbyTraj(data: OriginalDataItem[], trajectory: any, wallWidth?: number, findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void): OriginalDataItem[];
+    static boundExtbyTrajAndOriginalData(opt: IByTrajAnOriginData): OriginalDataItem[];
+    /** 通过轨迹点外扩边线
+     * @param lines
+     * @param trajectory
+     * @param wallWidth
+     * @param findCallBack
+     * @returns
+     */
+    static boundExtbyTraj(opt: IByTraj): {
+        lines: LineSegment<Record<string, any>>[];
+        toOriginalData(originalZAverage: number): OriginalDataItem[];
+    };
 }
+export {};

package/src/utils/DxfSystem/utils/DoubleWallHelper.d.ts

@@ -1,5 +1,14 @@
 import { LineSegment } from '../../LineSegment';
+import { Quadtree } from '../../Quadtree';
 import { LineUserData } from '../type';
+type ProjectionAnalysisResult = {
+    source: LineSegment;
+    sourceIndex: number;
+    target: LineSegment;
+    targetIndex: number;
+    project: LineSegment;
+    project2: LineSegment;
+};
 export declare class DoubleWallHelper {
     static errorAngle: number;
     /** 线段投影分析
@@ -9,6 +18,11 @@ export declare class DoubleWallHelper {
      * @returns
      */
     private static projectionAnalysis;
+    static findDoubleLine(lines: LineSegment<LineUserData>[], wallWidth?: number): {
+        resultList: ProjectionAnalysisResult[];
+        walls: LineSegment<LineUserData>[];
+        quadtree: Quadtree<number>;
+    };
     /**
      * @param lines
      * @param wallWidth
@@ -16,3 +30,4 @@ export declare class DoubleWallHelper {
      */
     static complementSide(lines: LineSegment<LineUserData>[], wallWidth?: number): LineSegment<LineUserData>[];
 }
+export {};

package/src/utils/DxfSystem/utils/LineGroupType.d.ts

@@ -26,6 +26,10 @@ export declare class LineGroupType {
      * @returns
      */
     static replace(line: LineSegment<LineUserData>, id: string, type: string): boolean;
+    /** 有组
+     * @param line
+     */
+    static hasGroup(line: LineSegment<LineUserData>): boolean;
     /**
      * 检查线段是否包含指定的分组ID
      * @param line
@@ -67,12 +71,19 @@ export declare class LineGroupType {
      */
     static getUnionTypes(lines: LineSegment<LineUserData>[]): string[];
     /**
-     * 获取所有线段的交集类型（所有线段都包含的类型）
+     *
      * @param line
      * @param id
      * @returns
      */
     static remove(line: LineSegment<LineUserData>, id: string): boolean;
+    /**
+     * 获取所有线段的交集类型（所有线段都包含的类型）
+     * @param line
+     * @param id
+     * @returns
+     */
+    static removeByType(line: LineSegment<LineUserData>, type: string): boolean;
     /**
      * 清空线段的所有分组信息
      * @param line

package/src/utils/DxfSystem/utils/buildGroup.d.ts

@@ -0,0 +1,12 @@
+import { LineSegment } from '../../LineSegment';
+import { LineUserData } from '../type';
+/** 构建双线墙组结构
+ * @param newLines
+ * @returns
+ */
+export declare function buildDoubleWallGroup(lines: LineSegment<LineUserData>[], doorLines?: LineSegment[], grouped?: boolean, clearInternalLine?: boolean): LineSegment<Record<string, any>>[];
+/** 构建飘窗组组结构
+ * @param lines
+ * @returns
+ */
+export declare function buildBayWindowGroup(lines: LineSegment<LineUserData>[], clear?: boolean): LineSegment<LineUserData>[];

package/src/utils/DxfSystem/utils/clippingDoubleWall.d.ts

@@ -1,5 +1,5 @@
 import { LineSegment } from '../../LineSegment';
-/** 分割多边形环为长方形
+/** 分割多边形环为长方形，多边形环必须满足，每个角都为90度
  * @param lines
  * @returns
  */

package/src/utils/DxfSystem/utils/findDiscretePointLine.d.ts

@@ -1,14 +1,21 @@
 import { PointVirtualGrid } from '../../PointVirtualGrid';
 import { LineSegment } from '../../LineSegment';
+import { MapEnhance } from '../../Map';
+import { Point } from '../../Point';
 /** 查找有游离的点的线段，也就是有一端没有其他链接线的线段
  * @param lines
  * @param grid
  * @returns
  */
-export declare function findDiscretePointLine<T = any>(lines: LineSegment<T>[], grid0?: PointVirtualGrid<LineSegment<T>>, removeLines?: Set<LineSegment<T>>, deep?: boolean): Set<LineSegment<T>>;
+export declare function findDiscretePointLine<T = any>(lines: LineSegment<T>[], grid0?: PointVirtualGrid<LineSegment<T>>, lineSet?: Set<LineSegment<T>>, deep?: boolean): Set<LineSegment<T>>;
 /** 查找有游离的点的线段, 通过点的统计，而不是虚拟网格
  * @param lines
  * @param grid
  * @returns
  */
-export declare function findDiscretePointLine2<T = any>(lines: LineSegment<T>[], removeLines?: Set<LineSegment<T>> | null, deep?: boolean): Set<LineSegment<T>>;
+export declare function findDiscretePointLine2<T = any>(lines: LineSegment<T>[], lineSet?: Set<LineSegment<T>> | null, deep?: boolean): Set<LineSegment<T>>;
+/** 获取游离的点
+ * @param lines
+ * @returns
+ */
+export declare function findDiscretePoint<T = any>(lines: LineSegment<T>[]): MapEnhance<Point<Record<string, any>>, LineSegment<T>>;

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

@@ -6,11 +6,17 @@ export * from './DoubleWallHelper';
 export * from './clippingDoubleWall';
 export * from './clippingLineUserData';
 export * from './closedPathArea';
-export * from './createPointVirtualGrid';
+export * from './tools';
 export * from './findLargestCircle';
 export * from './findDiscretePointLine';
 export * from './findVerticalReference';
-export * from './lineDataToOriginalData';
 export * from './mergeLineUserData';
 export * from './originalDataToLineData';
 export * from './recomputedWindow';
+export * from './buildGroup';
+export * from './LineGroupType';
+export * from './findClosedPolygons';
+export * from './lineDataToThreeVJiaJson';
+export * from './mergeSmallestCircle';
+export * from './smallestCircle';
+export * as tools from './tools';

package/src/utils/DxfSystem/utils/lineDataToThreeVJiaJson.d.ts

@@ -0,0 +1,46 @@
+import { LineSegment } from '../../LineSegment';
+import { LineUserData } from '../type';
+import { Point } from '../../Point';
+type Hole = {
+    id: number;
+    type: "DOOR" | "WINDOW";
+    start: Point;
+    end: Point;
+    height: number;
+    groundClearance?: number;
+    sillHeight: number;
+    openSide?: "RIGHT" | "LEFT" | "UP" | "DOWN";
+};
+type Wall = {
+    ID: number;
+    start: Point;
+    end: Point;
+    thickness: number;
+    type: "LINE";
+    isDoor: boolean;
+    loadBearingWall: boolean;
+    height: number;
+};
+type Room = {};
+export type ThreeVJiaJsonObject = {
+    version: string;
+    name: string;
+    communityName: string;
+    city: string;
+    province: string;
+    height: number;
+    walls: Wall[];
+    pillars: any[];
+    beams: any[];
+    holes: Hole[];
+    rooms: Room[];
+};
+/**
+ *  转为 三维家 墙体结构
+ * @param data
+ */
+export declare function lineDataToThreeVJiaJson(lineSegments: LineSegment[], angle?: number, updateGroup?: boolean): {
+    lines: LineSegment<LineUserData>[];
+    toJson(name?: string, communityName?: string): ThreeVJiaJsonObject;
+};
+export {};

package/src/utils/DxfSystem/utils/mergeSmallestCircle.d.ts

@@ -8,7 +8,7 @@ export declare function ringsDeduplication(rings: LineSegment[][]): LineSegment<
  * @param lines
  * @param ringEdges
  */
-export declare function mergeSmallestCircle(rings: LineSegment[][]): {
+export declare function mergeSmallestCircle(rings: LineSegment[][], test?: boolean): {
     internalEdges: LineSegment<Record<string, any>>[];
     rings: LineSegment<Record<string, any>>[][];
 };

package/src/utils/DxfSystem/utils/recomputedWindow.d.ts

@@ -10,3 +10,7 @@ export declare function recomputedWindow(...windowLines: LineSegment<LineUserDat
  * @param windowLines
  */
 export declare function recomputedWindowCenter(...windowLines: LineSegment<LineUserData>[]): void;
+/**
+ * @param windowLines
+ */
+export declare function mergeWindow(...windowLines: LineSegment<LineUserData>[]): void;

package/src/utils/DxfSystem/utils/{createPointVirtualGrid.d.ts → tools.d.ts}

@@ -1,3 +1,5 @@
 import { PointVirtualGrid } from '../../PointVirtualGrid';
 import { LineSegment } from '../../LineSegment';
+import { Quadtree } from '../../Quadtree';
 export declare function createPointVirtualGrid<T = any>(lines: LineSegment<T>[]): PointVirtualGrid<LineSegment<T>>;
+export declare function createQuadtree<T = any>(lines: LineSegment<T>[]): Quadtree<LineSegment<T>>;

package/src/utils/LineSegment.d.ts

@@ -67,7 +67,7 @@ export declare class LineSegment<T = Record<string, any>> {
     /** 旋转
      * @param angle 弧度
      */
-    rotate(angle: number): this;
+    rotate(angle: number, center?: Point<Record<string, any>>): this;
     /** 镜像线段
      */
     mirror(): void;
@@ -95,10 +95,11 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     normal(): Point<Record<string, any>>;
     /**
-     * 线段长度
+     * 线段长度（缓存优化）
      * @returns
      */
-    length(): number;
+    cachedLength: number | null;
+    length(cached?: boolean): number;
     /**
      * 计算一条线段在另一条直线上的投影，并裁剪超出目标线段的部分
      * @param line 要投影的线段
@@ -194,6 +195,7 @@ export declare class LineSegment<T = Record<string, any>> {
      * @returns
      */
     areLinesCoincident(line: LineSegment): boolean;
+    isSameLine(line: LineSegment, eps?: number): boolean;
     /** 克隆
      * @returns
      */
@@ -223,6 +225,10 @@ export declare class LineSegment<T = Record<string, any>> {
      * @returns
      */
     static groupByPoint(lines: LineSegment[]): LineSegment<Record<string, any>>[][];
+    /** 分组，通过方向
+     * @param lines
+     */
+    static groupByDirection(lines: LineSegment[], errAngle?: number): LineSegment<Record<string, any>>[][];
     /** 合并线段到最长线段
      * @param lines
      * @returns
@@ -246,7 +252,7 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param callBack
      * @returns
      */
-    static brokenLineMerging(lines: LineSegment[], callBack?: (newLine: LineSegment, group: LineSegment[]) => void): LineSegment<Record<string, any>>[];
+    static brokenLineMerging(lines: LineSegment[], callBack?: (newLine: LineSegment, group: LineSegment[]) => void, removeLines?: Set<LineSegment<Record<string, any>>>, newLines?: LineSegment[]): LineSegment<Record<string, any>>[];
     /** 去重
      * @param lines
      * @returns

package/src/utils/Point.d.ts

@@ -137,7 +137,8 @@ export declare class Point<T = Record<string, any>> {
      * 获取两个点长度
      * @param point
      */
-    distance(point: Point): number;
+    private _distanceMap;
+    distance(point: Point, cached?: boolean): number;
     hashCode(fixed?: number): string;
     /**
      * 克隆
@@ -159,4 +160,6 @@ export declare class Point<T = Record<string, any>> {
     };
     static from(arr: any): Point<Record<string, any>>;
     static zero(): Point<Record<string, any>>;
+    private static distanceClearQueue;
+    static addDistanceCacheClear(...points: Point[]): void;
 }

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

@@ -1,5 +1,6 @@
 import { Box2 } from '../Box2';
 import { Point } from '../Point';
+import { Polygon } from '../Polygon';
 import { Rectangle } from '../Rectangle';
 type Target<T> = {
     point: Point;
@@ -21,7 +22,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param point
      * @param userData
      */
-    insert(point: Point, userData?: T): this;
+    insert(point: Point, userData?: T): this | undefined;
     /**
      * 批量加入
      * @param points
@@ -56,7 +57,10 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param rectangle 矩形
      * @returns 相交的节点数组
      */
-    queryRect(rectangle: Rectangle): void;
+    queryRect(rectangle: Rectangle): {
+        point: Point;
+        userData?: T;
+    }[];
     /**
      * 查询与圆形区域相交的点
      * @param pos 圆心
@@ -81,6 +85,13 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param point
      */
     queryPoint(point: Point, excludeOneself?: boolean): PvgList<T>;
+    /** 获取多边形内的点
+     * @param polygon
+     */
+    queryPolygon(polygon: Polygon): {
+        point: Point;
+        userData?: T;
+    }[];
     /**
      * 查找点自己
      * @param point

package/src/utils/Polygon.d.ts

@@ -1,13 +1,18 @@
+import { Box2 } from './Box2';
 import { LineSegment } from './LineSegment';
 import { Point } from './Point';
 export declare class Polygon<T = any> extends Array<Point<T>> {
     constructor(points?: Point<T>[]);
+    /** 计算二维包围盒
+     * @returns
+     */
+    getBox2(): Box2;
     /**
      * 获取点相对于多边形的位置
      * @param point
      * @returns 'on' 边上，'inside' 内部，'outside' 外部
      */
-    pointPosition(point: Point): "on" | "outside" | "inside";
+    pointPosition(point: Point): "outside" | "on" | "inside";
     /** 点在多边形上：包括路径和内部
      * @param point
      * @returns

package/src/utils/UndirectedGraph.d.ts

@@ -10,6 +10,10 @@ export declare class UndirectedGraph {
     removeNode(node: number): void;
     getNeighbors(node: number): Set<number> | undefined;
     printGraph(): void;
+    /** 获取能组成的所有路径
+     * @returns
+     */
+    getPaths(): number[][];
     /** 循环
      * @param callbackFun
      */
@@ -51,8 +55,17 @@ export declare class LineSegmentUndirectedGraph extends UndirectedGraph {
      * 批量添加线段（比逐条 addLine 更快）
      */
     addLines(lines: readonly LineSegment[]): this;
+    /** 路径转线段组
+     * @param path
+     */
+    pathToLines(path: number[]): LineSegment<Record<string, any>>[];
     /**
      * 清空图
      */
     clear(): void;
+    /** 线段图旋转
+     * @param lines
+     * @param angle 角度
+     */
+    static rotate(lines: LineSegment[], angle: number, callbackFun?: (line: LineSegment, center: Point, angle: number) => void): LineSegment<Record<string, any>>[];
 }

package/src/utils/index.d.ts

@@ -12,6 +12,6 @@ export * from './UnionFindSet';
 export * from './cloneUserData';
 export * from './selectLocalFile';
 export * from './PointVirtualGrid';
-export * as dxfSystem from './DxfSystem';
-export * as commandManager from './CommandManager';
-export * as componentManager from './ComponentManager';
+export * from './DxfSystem';
+export * from './CommandManager';
+export * from './ComponentManager';