build-dxf 0.0.22 → 0.0.24

package/src/selectLocalFile.js

@@ -125,6 +125,10 @@ class yn extends at {
    * @param count 
    */
   createLineSegments(t, n, r, a = this.container) {
+    if (Array.isArray(t)) {
+      const s = t.flatMap((l) => l?.points?.flatMap((u) => [u.x, u.y, 0]));
+      return this.createLineSegments({ position: s }, t.length * 2, r, a);
+    }
     const o = new _.BufferGeometry();
     Object.keys(t).forEach((s) => {
       const l = t[s];

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

@@ -2,6 +2,8 @@ import { Component } from '../../ComponentManager';
 import { Point } from '../../Quadtree/Point';
 import { Box2 } from '../../Quadtree/Box2';
 import { LineSegment } from '../../Quadtree/LineSegment';
+import { Quadtree, QuadtreeNode } from '../../Quadtree/Quadtree';
+import * as THREE from "three";
 type Unit = "Unitless" | "Inches" | "Feet" | "Miles" | "Millimeters" | "Centimeters" | "Meters" | "Kilometers" | "Microinches" | "Mils" | "Yards" | "Angstroms" | "Nanometers" | "Microns" | "Decimeters" | "Decameters" | "Hectometers" | "Gigameters" | "Astronomical units" | "Light years" | "Parsecs";
 export interface OriginalDataItem {
     start: {
@@ -37,6 +39,7 @@ export interface OriginalDataItem {
             z?: number;
         };
     };
+    wallWidth?: number;
     isWindow?: boolean;
     isVerticalReferenceLine?: boolean;
     drawWindow?: {
@@ -49,6 +52,20 @@ export interface OriginalDataItem {
         full: boolean;
     }[];
 }
+export type LineUserData = {
+    doorDirectConnection?: boolean;
+    isDoor?: boolean;
+    isWindow?: boolean;
+    isVerticalReferenceLine?: boolean;
+    wallWidth?: number;
+    drawWindow?: {
+        p: THREE.Vector3;
+        width: number;
+        full: boolean;
+    }[];
+    drawDoorData?: any;
+    quadtreeNode?: QuadtreeNode;
+};
 /**
  * [开始点, 结束点, 相交点, 是否是门, 索引]
  */
@@ -100,12 +117,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     wallsGroup: Point[][];
     doors: DataItem[];
     doorLineSegment: LineSegment[];
-    lineSegments: LineSegment<{
-        isDoor: boolean;
-        isWindow: boolean;
-        drawDoorData: any;
-        drawWindow: any[];
-    }>[];
+    lineSegments: LineSegment<LineUserData>[];
     originalZAverage: number;
     static EndType: {
         etOpenSquare: number;
@@ -119,25 +131,31 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     };
     /** 原始数据组
      */
-    get lines(): LineSegment<{
-        isDoor: boolean;
-        isWindow: boolean;
-        drawDoorData: any;
-        drawWindow: any[];
-    }>[];
+    get lines(): LineSegment<LineUserData>[];
     /**初始化
      * @param data 点云数据
      * @param width 墙体宽度
      * @param scale 缩放比例
      */
     constructor(width?: number, scale?: number);
+    /**
+     * 预处理数据
+     * @param data
+     */
+    preprocessing(data: OriginalDataItem[], axisAlignmentCorrection?: boolean): {
+        lineSegments: LineSegment<Record<string, any>>[];
+        data: OriginalDataItem[];
+    } | {
+        lineSegments: LineSegment<LineUserData>[];
+        data: OriginalDataItem[];
+    };
     /**
      * 设置
      * @param data
      * @param width
      * @param scale
      */
-    set(data: OriginalDataItem[] | string, width?: number, scale?: number): Promise<any>;
+    set(data: OriginalDataItem[] | string, width?: number, scale?: number, axisAlignmentCorrection?: boolean): Promise<any>;
     /** 创建分组
      * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
      * @returns
@@ -190,6 +208,10 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     private getArcAngleRange;
+    /**
+     * 线段数据转为原始json数据
+     */
+    lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
     /**
      * 转为绘制数据
      */
@@ -208,6 +230,11 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     toDxfBlob(unit?: Unit): Blob;
+    /**
+    * 下载原始json
+    * @param filename
+    */
+    downloadOriginalData(filename: string): Promise<void>;
     /**
      * 下载
      * @param filename

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

@@ -4,6 +4,7 @@ import { Variable } from './Variable';
 import { Quadtree } from '../../Quadtree/Quadtree';
 import { LineSegment } from '../../Quadtree/LineSegment';
 import { Point } from '../../Quadtree/Point';
+import { PointVirtualGrid } from '../../PointVirtualGrid';
 import * as THREE from "three";
 type ProjectionAnalysisResult = {
     source: LineSegment;
@@ -13,6 +14,81 @@ type ProjectionAnalysisResult = {
     project: LineSegment;
     project2: LineSegment;
 };
+type DoorPoint = {
+    line: LineSegment;
+    point: Point;
+    uuid: string;
+};
+declare class DoorsAnalysis {
+    possibleDoorPoints: DoorPoint[];
+    doorPoint: DoorPoint[];
+    dxf: Dxf;
+    pointVirtualGrid: PointVirtualGrid<LineSegment<Record<string, any>>>;
+    findPointVirtualGrid: PointVirtualGrid<LineSegment>;
+    quadtree: Quadtree;
+    resultList: ProjectionAnalysisResult[];
+    lineSegments: LineSegment[];
+    doorSearchNearAngle: number;
+    doorSearchDistance: number;
+    doors: LineSegment[];
+    lineAnalysis: LineAnalysis;
+    continueFind: boolean;
+    constructor(lineAnalysis: LineAnalysis);
+    private handle;
+    private search;
+    /** 添加可查找点的过滤规则
+     * @param rule
+     */
+    addPointsExcludeRule(rule: (line: LineSegment, point: Point, pointIndex: number) => boolean): void;
+    private _pointsExcludeRule;
+    /**
+     * 查找所有可能为门的点位
+     */
+    getPossiblePoints(): DoorPoint[];
+    /**
+     * 查找已知为门的点位
+     */
+    getDoorPoint(): DoorPoint[];
+    /**
+     * 查找双线墙的点位
+     * @returns
+     */
+    searchDoubleLinePoint(): Map<number, 0 | 1 | -1>;
+    /** 查找方案一：最近点查找
+     * @description 以点为圆心，查找半径内符合角度的点
+     * @param doorPoints
+     * @param possibleDoorPoints
+     * @param doorSearchDistance 查找的距离（半径）
+     * @param doorSearchNearAngle 查找的角度
+     * @returns
+     */
+    searchNearby(doorPoints: DoorPoint[], possibleDoorPoints?: DoorPoint[], doorSearchDistance?: number, doorSearchNearAngle?: number): any[];
+    /** 方案二： 沿方向查找
+     * @description
+     * @param param0
+     * @returns
+     */
+    searchAlongDirection({ point, line }: DoorPoint, doorSearchDistance?: number): {
+        point: Point;
+        line: LineSegment<Record<string, any>>;
+    } | undefined;
+    /** 方案三： 沿法线方向查找
+     * @description
+     * @param param0
+     * @param doorSearchDistance
+     * @returns
+     */
+    searchAlongNormalDirection({ point, line }: DoorPoint, doorSearchDistance?: number): {
+        point: Point;
+        line: LineSegment<Record<string, any>>;
+    } | undefined;
+    /**
+     *
+     * @param line
+     * @returns
+     */
+    findLongLineSegment(line: LineSegment): LineSegment<Record<string, any>>;
+}
 export declare class LineAnalysis extends Component<{
     analysisCompleted: {};
 }> {
@@ -76,6 +152,7 @@ export declare class LineAnalysis extends Component<{
     doorSearchNearAngle: number;
     doorSearchDistance: number;
     doors: LineSegment[];
+    DoorsAnalysis?: DoorsAnalysis;
     doorsAnalysis(): void;
 }
 export {};

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

@@ -0,0 +1,45 @@
+import { Component } from '../../ComponentManager';
+import { LineSegment } from '../../Quadtree/LineSegment';
+/**
+ * 转为 三维家 墙体结构
+ */
+export declare class ThreeVJia extends Component<{
+    updateData: {};
+}> {
+    static name: string;
+    lineSegments: LineSegment<any>[];
+    onAddFromParent(): void;
+    updateData(): 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;
+            loadBearingWall: boolean;
+            height: number;
+        }[];
+        pillars: never[];
+        beams: never[];
+        holes: any[];
+        rooms: never[];
+    };
+    /**
+     * 下载
+     * @param filename
+     */
+    download(filename?: string): Promise<void>;
+}

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

@@ -12,26 +12,21 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
     container: THREE.Group<THREE.Object3DEventMap>;
     shortcutKeys: string[];
     shortcutKeys2: string[];
+    shortcutKeys3: string[];
     static commandName: string;
     recursion: boolean;
+    axisAlignment: boolean;
     onAddFromParent(parent: ComponentManager): void;
     /**
      * 进入命令约束
      */
     constraint(next: any, selectLines: LineSegment[]): void;
     /**
-     * 线段是否为结尾线段
-     * @param line
-     */
-    lineIsPathEnd(line: LineSegment): boolean;
-    /**
-     *
      * @param line0
      * @param line1
      */
     isTowLineSegmentConnect(line0: LineSegment, line1: LineSegment): boolean;
     /**
-     *
      * @param line
      * @param newStartPoint
      * @param newEndPoint
@@ -55,6 +50,14 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @param vistedList
      */
     correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[];
+    /** 轴对齐垂直修正
+     * @param targettLine
+     * @returns
+     */
+    axisAlignmentCorrection(targettLine: LineSegment): {
+        newLines: LineSegment<Record<string, any>>[];
+        oldLines: LineSegment<import('../../../../components/Dxf').LineUserData>[];
+    };
     /** 开始
      * @param next
      */

package/src/utils/DxfSystem/plugin/Editor/components/RenderManager.d.ts

@@ -1,36 +1,19 @@
 import { LineSegment } from '../../../../Quadtree/LineSegment';
 import { Component } from '../../../../ComponentManager';
-import { Dxf, OriginalDataItem } from '../../../components/Dxf';
+import { Dxf, LineUserData, OriginalDataItem } from '../../../components/Dxf';
 import { Variable } from '../../../components/Variable';
 import { EventInput, Renderer } from '../../RenderPlugin/components';
 import { PointVirtualGrid } from '../../../../PointVirtualGrid';
 import { Editor } from './Editor';
-import { Quadtree, QuadtreeNode } from '../../../../Quadtree/Quadtree';
+import { Quadtree } from '../../../../Quadtree/Quadtree';
 import { DxfLineModel } from '../../ModelDataPlugin/components';
 import * as THREE from "three";
-export type LineUserData = {
-    doorDirectConnection?: boolean;
-    isDoor?: boolean;
-    isWindow?: boolean;
-    isVerticalReferenceLine?: boolean;
-    drawWindow?: {
-        p: THREE.Vector3;
-        width: number;
-        full: boolean;
-    }[];
-    drawDoorData?: any;
-    quadtreeNode?: QuadtreeNode;
-};
 export declare class RenderManager extends Component<{}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     lines: LineSegment<LineUserData>[];
     pointVirtualGrid: PointVirtualGrid<LineSegment<LineUserData>>;
     quadtree: Quadtree<any>;
-    actionHistory: Set<{
-        type: "addLine" | "removeLine";
-        data: any;
-    }>;
     verticalReferenceLineFlag: THREE.Mesh<THREE.PlaneGeometry, THREE.MeshBasicMaterial, THREE.Object3DEventMap>;
     onAddFromParent(): void;
     private updatedMode;
@@ -50,6 +33,11 @@ export declare class RenderManager extends Component<{}> {
      * @param line
      */
     removeLine(line: LineSegment<LineUserData>): void;
+    /**
+     * 删除
+     * @param lines
+     */
+    removeLines(lines: LineSegment<LineUserData>[]): void;
     /**
      * 绘制
      */

package/src/utils/DxfSystem/plugin/RenderPlugin/components/Renderer.d.ts

@@ -3,6 +3,7 @@ import { CSS2DRenderer, CSS2DObject } from 'three/addons/renderers/CSS2DRenderer
 import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 import { Component } from '../../../../ComponentManager';
 import { Point } from '../../../../Quadtree/Point';
+import { LineSegment } from '../../../../Quadtree/LineSegment';
 import * as THREE from "three";
 export interface RendererDescription {
     canvas: HTMLCanvasElement;
@@ -85,6 +86,6 @@ export declare class Renderer extends Component<{
      * @param map
      * @param count
      */
-    createLineSegments(map: Record<string, number[]>, count: number, parameters?: THREE.LineBasicMaterialParameters, parent?: THREE.Object3D): THREE.LineSegments<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
+    createLineSegments(map: Record<string, number[]> | LineSegment[], count: number, parameters?: THREE.LineBasicMaterialParameters, parent?: THREE.Object3D): THREE.LineSegments;
     destroy(): void;
 }

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

@@ -87,4 +87,10 @@ export declare class Box2 {
      * @returns
      */
     static fromByPoints(...points: Point[]): Box2;
+    /**
+     *
+     * @param points
+     * @returns
+     */
+    static fromByLineSegment(...lines: LineSegment[]): Box2;
 }

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

@@ -123,6 +123,11 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param line
      */
     directionEqual(line: LineSegment, errAngle?: number): boolean;
+    /**
+     * 两条线段是否平行
+     * @param line
+     */
+    parallel(line: LineSegment, errAngle?: number): boolean;
     /**
      * 两条线段方向相反否一致
      * @param line
@@ -140,4 +145,16 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     areLinesCoincident(line: LineSegment): boolean;
     clone(): LineSegment<T>;
+    /**
+     * 轴对齐垂直修正
+     * @param lines 待调整线段组
+     * @param targettLine 轴线段
+     * @returns
+     */
+    static axisAlignmentCorrection(lines: LineSegment[], targettLine: LineSegment): LineSegment<Record<string, any>>[];
+    /**
+     * 获取最长线段
+     * @param lines
+     */
+    static maxLengthLineIndex(lines: LineSegment[]): number;
 }