build-dxf 0.0.35 → 0.0.36

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

@@ -267,6 +267,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     private computedOriginalSize;
+    get boundaryExtension(): typeof Dxf.boundaryExtension;
     /**
      * 线段数据转为原始json数据
      */
@@ -277,6 +278,16 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     static createData(pointsGroups: Point[][], sealed?: boolean): OriginalDataItem[];
+    /** 根据交点，对线段进行裁剪
+     * @param this
+     * @param lines
+     */
+    static lineSegmentClipping(lines: LineSegment<LineUserData>[]): LineSegment<LineUserData>[];
+    /**
+     * 重新计算窗户
+     * @param windowLines
+     */
+    static recomputedWindow(...windowLines: LineSegment<LineUserData>[]): void;
     /**
      * 轴对齐垂直修正
      * @param lines 待调整线段组
@@ -284,7 +295,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     static axisAlignmentCorrection(lines: LineSegment[], targettLine: LineSegment, option?: AxisAlignmentCorrectionOption): LineSegment<LineUserData>[];
-    /**
+    /** 查找外墙
      * @param lines
      * @param trajectoryPoints
      * @returns
@@ -295,6 +306,5 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @param trajectoryPoints
      */
     static boundaryExtension(data: OriginalDataItem[], trajectory: any, wallWidth?: number): OriginalDataItem[];
-    boundaryExtension: typeof Dxf.boundaryExtension;
 }
 export {};

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

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

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

@@ -60,11 +60,6 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @param next
      */
     verticalCorrection(next: any, selectLines: LineSegment[]): void;
-    /**
-     * 窗户恢复
-     * @param doorLines
-     */
-    windowRecover(doorLines: LineSegment<LineUserData>[]): void;
     /** 执行完成
      * @param data
      */

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

@@ -175,4 +175,26 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param lines
      */
     static maxLengthLineIndex(lines: LineSegment[], excludeCallBack?: (line: LineSegment) => boolean): number;
+    /** 对平行并且共线线段分组
+     * @param selectLines
+     */
+    static groupBySamePointAndParallel(selectLines: LineSegment[]): LineSegment<Record<string, any>>[][];
+    /** 合并平行线段
+     * @param lines
+     * @returns
+     */
+    static mergeLines(...lines: LineSegment[]): LineSegment<Record<string, any>>;
+    /** 合并满足平行的线段
+     * @param selectLines
+     */
+    static autoMergeLines(selectLines: LineSegment[]): {
+        lines: LineSegment<Record<string, any>>[];
+        newLines: LineSegment<Record<string, any>>[];
+        deleteLines: LineSegment<Record<string, any>>[];
+    };
+    /** 去重
+     * @param lines
+     * @returns
+     */
+    static deduplication(lines: LineSegment[]): LineSegment<Record<string, any>>[];
 }

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

@@ -16,16 +16,21 @@ export declare class Quadtree<T = any> {
     children: Quadtree[] | null;
     nodes: QuadtreeNode<T>[];
     color: number[];
-    constructor(bounds: Box2, capacity?: number, maxDepth?: number, depth?: number);
+    targetMap: Map<LineSegment, QuadtreeNode<T>>;
+    constructor(bounds: Box2, capacity?: number, maxDepth?: number, depth?: number, targetMap?: Map<LineSegment<Record<string, any>>, QuadtreeNode<T>>);
     /**
      * 插入线段节点
      * @param node 线段节点
      */
-    insert(node: QuadtreeNode<T>): void;
+    insert(node: QuadtreeNode<T> | LineSegment): void;
     /** 移除
      * @param node
      */
-    remove(node: QuadtreeNode<T>): void;
+    remove(node: QuadtreeNode<T> | LineSegment): void;
+    /** 移除
+     * @param node
+     */
+    update(node: QuadtreeNode<T> | LineSegment): void;
     /**
      * 获取线段所属的象限
      * @param line 线段

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

@@ -1,276 +0,0 @@
-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: {
-        x: number;
-        y: number;
-        z?: number;
-    };
-    end: {
-        x: number;
-        y: number;
-        z?: number;
-    };
-    insetionArr: {
-        index: number;
-        p: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-    }[];
-    length: number;
-    isDoor?: boolean;
-    doorDirectConnection?: boolean;
-    drawDoorData?: {
-        start: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-        n: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-    };
-    wallWidth?: number;
-    isWindow?: boolean;
-    isVerticalReferenceLine?: boolean;
-    drawWindow?: {
-        p: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-        width: number;
-        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;
-};
-/**
- * [开始点, 结束点, 相交点, 是否是门, 索引]
- */
-export type DataItem = [Point, Point, number[], boolean, number];
-export type DrawData = {
-    unit: Unit;
-    line: [number, number, number, number, string][];
-    arc: [number, number, number, number, number, string][];
-    dimensionLine: number[][];
-    center: {
-        x: number;
-        y: number;
-    };
-    width: number;
-    height: number;
-    scale: number;
-};
-/**
- *
- */
-export interface PointGroup {
-    points: Point[];
-    indices: number[];
-}
-/**
- * 将点云结构转换为DXF格式
- */
-export declare class Dxf<TEventMap extends {} = {}> extends Component<{
-    setDta: {
-        originalData: OriginalDataItem[];
-        data: DataItem[];
-    };
-    lineOffset: {
-        wallsGroup: Point[][];
-    };
-    createGroup: {
-        groups: Point[][][];
-    };
-} & TEventMap> {
-    static name: string;
-    shortLine: number;
-    width: number;
-    scale: number;
-    originalData: OriginalDataItem[];
-    data: DataItem[];
-    originalBox: Box2;
-    box: Box2;
-    pointsGroups: Point[][][];
-    wallsGroup: Point[][];
-    doors: DataItem[];
-    doorLineSegment: LineSegment[];
-    lineSegments: LineSegment<LineUserData>[];
-    originalZAverage: number;
-    static EndType: {
-        etOpenSquare: number;
-        etOpenRound: number;
-        etOpenButt: number;
-    };
-    static JoinType: {
-        jtSquare: number;
-        jtRound: number;
-        jtMiter: number;
-    };
-    /** 原始数据组
-     */
-    get lines(): LineSegment<LineUserData>[];
-    /**初始化
-     * @param data 点云数据
-     * @param width 墙体宽度
-     * @param scale 缩放比例
-     */
-    constructor(width?: number, scale?: number);
-    /**
-     * 预处理数据
-     * @param data
-     */
-    preprocessing(data: OriginalDataItem[], axisAlignmentCorrection?: boolean): {
-        lineSegments: LineSegment<LineUserData>[];
-        data: OriginalDataItem[];
-    };
-    /**
-     * 设置
-     * @param data
-     * @param width
-     * @param scale
-     */
-    set(data: OriginalDataItem[] | string, width?: number, scale?: number, axisAlignmentCorrection?: boolean): Promise<any>;
-    /** 创建分组
-     * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
-     * @returns
-     */
-    private createGroups;
-    /** 计算当前墙体数据的边界框
-     * @description 根据分组数据pointsGroups，计算包围盒， pointsGroups数据为缩放后数据。
-     * @description 可通过box属性查看计算结果。
-     * @returns
-     */
-    computedSize(): Box2;
-    /** 线路拓扑
-     * @description 处理线路拓扑，使线路有序链接，形成长路径
-     * @param lines
-     */
-    lineTopology(lines: Point[][]): Point<Record<string, any>>[][];
-    /** 合并方向相同的线段
-     * @param lines
-     * @param errAngle
-     */
-    private mergeSameDirectionLine;
-    /** etOpenRound 去除毛刺
-     * @description 检查连续的短线段数量，去除合并后产生的毛刺
-     */
-    private squareRemoveBurr;
-    /**
-     * 线段矫直, 线段中心突刺
-     * @description 突变长度小于墙体宽度，该线段可能为突起线段，
-     * @description 判断后续第2线段与上一条线段是否方向相同，相同就为突刺
-     */
-    lineSegmentStraightening(path: Point[]): Point<Record<string, any>>[];
-    /**
-     * 移除短线段
-     * @todo 根据线段两端线段长度，选取参照物_|▔▔
-     * @param path
-     */
-    removeShortLine(path: Point[], shortLine?: number): Point<Record<string, any>>[];
-    /** 线偏移
-     * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
-     */
-    lineOffset(endType?: number, joinType?: number, scale?: number): Point<Record<string, any>>[][];
-    /**
-     * 将点云结构转换为Float32Array
-     */
-    to3DArray(scale: number, z?: number): Float32Array<ArrayBuffer>;
-    /** 获取角度范围
-     * @param center
-     * @param p1
-     * @param p2
-     * @returns
-     */
-    private getArcAngleRange;
-    /**
-     * 线段数据转为原始json数据
-     */
-    lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
-    /**
-     * 转为绘制数据
-     */
-    toDrawDataJson(unit?: Unit): DrawData;
-    /**
-     *
-     * @param type
-     */
-    toDxfImageBlob(unit?: Unit, type?: string, background?: string): Promise<any>;
-    /**
-     * 将点json结构转换为Dxf string
-     */
-    toDxfString(unit?: Unit): string;
-    /**
-     * 将点云结构转换为DXF格式
-     * @returns
-     */
-    toDxfBlob(unit?: Unit): Blob;
-    /**
-    * 下载原始json
-    * @param filename
-    */
-    downloadOriginalData(filename: string): Promise<void>;
-    /**
-     * 下载
-     * @param filename
-     */
-    download(filename: string, unit?: Unit): Promise<void>;
-    /**
-     * 下载
-     * @param filename
-     */
-    downloadImage(filename: string, unit?: Unit, type?: string): Promise<boolean>;
-    /**
-     * 计算原始数据的边界框
-     * @description 计算所有线段的起点和终点的最小最大值，形成一个边界框
-     * @returns
-     */
-    private computedOriginalSize;
-    /**
-     * 创建数据
-     * @param pointsGroups
-     * @returns
-     */
-    static createData(pointsGroups: Point[][], sealed?: boolean): OriginalDataItem[];
-    /**
-     * 轴对齐垂直修正
-     * @param lines 待调整线段组
-     * @param targettLine 轴线段
-     * @returns
-     */
-    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 {};