build-dxf 0.1.8 → 0.1.9

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

@@ -2,13 +2,11 @@ import { ComponentManager } from '../ComponentManager';
 import { CorrectionDxf } from './components/CorrectionDxf';
 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;
     Variable: Variable;
-    LineAnalysis: LineAnalysis;
     DoorsAnalysis: DoorsAnalysisComponent;
     CorrectionDxf: CorrectionDxf;
     wallWidth: number;
@@ -22,7 +20,6 @@ export declare class DxfSystem extends ComponentManager {
     destroy(): void;
 }
 declare const components: {
-    LineAnalysis: typeof LineAnalysis;
     ThreeVJia: typeof ThreeVJia;
     Variable: typeof Variable;
     Dxf: typeof Dxf;

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

@@ -4,7 +4,6 @@ import { Quadtree } from '../../Quadtree';
 import { LineSegment } from '../../LineSegment';
 import { Point } from '../../Point';
 import { PointVirtualGrid } from '../../PointVirtualGrid';
-import { LineAnalysis } from './LineAnalysis';
 type ProjectionAnalysisResult = {
     source: LineSegment;
     sourceIndex: number;
@@ -31,9 +30,8 @@ declare class DoorsAnalysis {
     doorSearchNearAngle: number;
     doorSearchDistance: number;
     doors: LineSegment[];
-    lineAnalysis: LineAnalysis;
     continueFind: boolean;
-    constructor(lineAnalysis: LineAnalysis, skipFindDoor: boolean);
+    constructor(dxf: Dxf, skipFindDoor: boolean);
     private handle;
     /** 查找
      * @param doorPoints
@@ -107,7 +105,6 @@ export declare class DoorsAnalysisComponent extends Component<{
     doorSearchDistance: number;
     DoorsAnalysis?: DoorsAnalysis;
     skipFindDoor: boolean;
-    needsSaveDoor: boolean;
     doors: LineSegment[];
     /**
      *

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

@@ -1,22 +1,22 @@
 import { Component } from '../../ComponentManager';
-import { Point } from '../../Point';
 import { Box2 } from '../../Box2';
 import { LineSegment } from '../../LineSegment';
 import { Quadtree } from '../../Quadtree';
-import { SetDataOption, DataItem, DrawData, LineUserData, OriginalDataItem, Unit } from '../type';
+import { SetDataOption, DataItem, LineUserData, OriginalDataItem, Unit } from '../type';
+import { CAD } from '../utils/CAD';
+type PreProcessor = (lines: LineSegment[], option: SetDataOption) => LineSegment[];
+export declare const PRE_PROCESSOR: Record<"DoorsAnalysis" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter", PreProcessor>;
 /**
  * 将点云结构转换为DXF格式
  */
 export declare class Dxf<TEventMap extends {} = {}> extends Component<{
-    setDta: {
+    dataChange: {
         originalData: OriginalDataItem[];
         data: DataItem[];
+        cad: CAD;
     };
-    lineOffset: {
-        wallsGroup: Point[][];
-    };
-    createGroup: {
-        groups: Point[][][];
+    cadChange: {
+        cad: CAD;
     };
     preprocessing: {
         data: OriginalDataItem[];
@@ -24,160 +24,101 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     };
 } & TEventMap> {
     static name: string;
-    shortLine: number;
+    static readonly PRE_PROCESSOR: Record<"DoorsAnalysis" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter", PreProcessor>;
     width: number;
-    scale: number;
     originalData: OriginalDataItem[];
     data: DataItem[];
-    originalBox: Box2;
     box: Box2;
-    pointsGroups: Point[][][];
-    wallsGroup: Point[][];
-    doors: DataItem[];
+    cad: CAD | null;
+    lineSegments: LineSegment<LineUserData>[];
     doorLineSegment: LineSegment[];
     verticalReferenceLine?: LineSegment<LineUserData>;
-    lineSegments: LineSegment<LineUserData>[];
     originalZAverage: number;
-    static EndType: {
-        etOpenSquare: number;
-        etOpenRound: number;
-        etOpenButt: number;
-    };
-    static JoinType: {
-        jtSquare: number;
-        jtRound: number;
-        jtMiter: number;
-    };
+    private _preProcessorSet;
+    trajectory: Record<string, any> | null;
+    onBoundExt?: (lines: LineSegment[], trajectory: any) => void;
     /** 原始数据组
      */
     get lines(): LineSegment<LineUserData>[];
     /**初始化
      * @param width 墙体宽度
-     * @param scale 缩放比例
-     */
-    constructor(width?: number, scale?: number);
-    /** 预处理数据
-     * @param data
      */
-    preprocessing(data: OriginalDataItem[]): {
-        lineSegments: LineSegment<LineUserData>[];
-        data: OriginalDataItem[];
-    };
-    /** 设置
-     * @param data 房屋结构数据，node环境可以为路径
-     * @param width 墙体宽度
-     * @param scale 缩放比例
-     * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
-     * @param option
-     * @returns
-     */
-    set(data: OriginalDataItem[] | string, width?: number, scale?: number): Promise<any>;
-    /** 创建分组
-     * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
-     * @returns
-     */
-    private createGroups;
-    /** 计算当前墙体数据的边界框
-     * @description 根据分组数据pointsGroups，计算包围盒， pointsGroups数据为缩放后数据。
-     * @description 可通过box属性查看计算结果。
+    constructor(width?: number);
+    setTrajectory(trajectory: Record<string, any> | null, onBoundExt?: (lines: LineSegment[], trajectory: any) => void): this;
+    /** 完整线段数据
      * @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>>[];
+    getLineSegments(clone?: boolean): LineSegment<LineUserData>[];
     /**
-     * 移除短线段
-     * @todo 根据线段两端线段长度，选取参照物_|▔▔
-     * @param path
+     * 预处理数据
+     * @param data
      */
-    removeShortLine(path: Point[], shortLine?: number): Point<Record<string, any>>[];
-    /** 线偏移
-     * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
+    private preprocessing;
+    /** 添加预处理
+     * @param handler
      */
-    lineOffset(endType?: number, joinType?: number, scale?: number): Point<Record<string, any>>[][];
-    /** 垂直纠正
-     * @param option
+    addPreProcessor(handler: PreProcessor): this;
+    /** 删除预处理
+     * @param handler
      */
-    axisAlignCorr(option?: SetDataOption): Promise<void>;
-    /** 完整线段数据
+    removePreProcessor(handler: PreProcessor): this;
+    /** 清空预处理
      * @returns
      */
-    getLineSegments(clone?: boolean): LineSegment<LineUserData>[];
-    /**
-     * 将点云结构转换为Float32Array
-     */
-    to3DArray(scale: number, z?: number): Float32Array<ArrayBuffer>;
-    /** 获取角度范围
-     * @param center
-     * @param p1
-     * @param p2
+    clearPreProcessor(): this;
+    /** 设置
+     * @param data 房屋结构数据，node环境可以为路径
+     * @param width 墙体宽度
+     * @param scale 缩放比例
+     * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
+     * @param option
      * @returns
      */
-    private getArcAngleRange;
+    set(data: OriginalDataItem[] | string, options?: SetDataOption): Promise<any>;
     /**
      * 线段数据转为原始json数据
      */
     lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
     /**
-     * 转为绘制数据
-     */
-    toDrawDataJson(unit?: Unit): DrawData;
-    /**
+   * 下载原始json
+   * @param filename
+   */
+    downloadOriginalData(filename: string): Promise<void>;
+    /** 获取绘制数据
+     */
+    toDrawData(unit?: Unit): {
+        unit: Unit;
+        lines: [number, number, number, number, string][];
+        arcs: [number, number, number, number, number, string][];
+        texts: [string, number, number, string][];
+        center: {
+            x: number;
+            y: number;
+        };
+        width: number;
+        height: number;
+        scale: number;
+    } | undefined;
+    /** 获取 dxf 图片 二进制对象
      * @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>;
-    /**
-     * 下载
+    /** 下载 dxf 图片
      * @param filename
      */
-    download(filename: string, unit?: Unit): Promise<void>;
+    downloadDxfImage(filename: string, unit?: Unit, type?: string): Promise<boolean | undefined>;
     /**
-     * 下载
-     * @param filename
+     * 将点json结构转换为Dxf 字符串
      */
-    downloadImage(filename: string, unit?: Unit, type?: string): Promise<boolean>;
+    toDxfString(unit?: Unit): string | undefined;
     /**
-     * 计算原始数据的边界框
-     * @description 计算所有线段的起点和终点的最小最大值，形成一个边界框
+     * 将点云结构转换为 DXF 二进制对象
      * @returns
      */
-    private computedOriginalSize;
-    /**
-     * 创建数据
-     * @param pointsGroups
-     * @returns
+    toDxfBlob(unit?: Unit): Blob | undefined;
+    /** 下载Dxf
+     * @param filename
      */
-    static createData(pointsGroups: Point[][], sealed?: boolean): OriginalDataItem[];
+    downloadDxf(filename: string, unit?: Unit): Promise<void | undefined>;
 }
+export {};

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

@@ -0,0 +1,183 @@
+import { Component } from '../../ComponentManager';
+import { Point } from '../../Point';
+import { Box2 } from '../../Box2';
+import { LineSegment } from '../../LineSegment';
+import { Quadtree } from '../../Quadtree';
+import { SetDataOption, DataItem, DrawData, LineUserData, OriginalDataItem, Unit } from '../type';
+/**
+ * 将点云结构转换为DXF格式
+ */
+export declare class Dxf<TEventMap extends {} = {}> extends Component<{
+    setDta: {
+        originalData: OriginalDataItem[];
+        data: DataItem[];
+    };
+    lineOffset: {
+        wallsGroup: Point[][];
+    };
+    createGroup: {
+        groups: Point[][][];
+    };
+    preprocessing: {
+        data: OriginalDataItem[];
+        setData(data: OriginalDataItem[]): void;
+    };
+} & 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[];
+    verticalReferenceLine?: LineSegment<LineUserData>;
+    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 width 墙体宽度
+     * @param scale 缩放比例
+     */
+    constructor(width?: number, scale?: number);
+    /** 预处理数据
+     * @param data
+     */
+    preprocessing(data: OriginalDataItem[]): {
+        lineSegments: LineSegment<LineUserData>[];
+        data: OriginalDataItem[];
+    };
+    /** 设置
+     * @param data 房屋结构数据，node环境可以为路径
+     * @param width 墙体宽度
+     * @param scale 缩放比例
+     * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
+     * @param option
+     * @returns
+     */
+    set(data: OriginalDataItem[] | string, width?: number, scale?: number): 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>>[][];
+    /** 垂直纠正
+     * @param option
+     */
+    axisAlignCorr(option?: SetDataOption): Promise<void>;
+    /** 完整线段数据
+     * @returns
+     */
+    getLineSegments(clone?: boolean): LineSegment<LineUserData>[];
+    /**
+     * 将点云结构转换为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[];
+}

package/src/utils/DxfSystem/plugin/ModelDataPlugin/components/WhiteModel.d.ts

@@ -5,7 +5,6 @@ import * as THREE from "three";
 export declare class WhiteModel extends Component<{
     updateModel: {
         whiteModelGroup: THREE.Group;
-        originalWhiteMode: THREE.Group;
     };
 }> {
     static name: string;
@@ -13,7 +12,6 @@ export declare class WhiteModel extends Component<{
     Variable: Variable | null;
     whiteModelGroup: THREE.Group<THREE.Object3DEventMap>;
     whiteModelLineGroup: THREE.Group<THREE.Object3DEventMap>;
-    originalWhiteMode: THREE.Group<THREE.Object3DEventMap>;
     material: THREE.MeshStandardMaterial;
     itemList: any[];
     promise?: Promise<THREE.Group>;

package/src/utils/DxfSystem/plugin/ModelDataPlugin/components/index.d.ts

@@ -1,3 +1,2 @@
 export * from './WhiteModel';
-export * from './DetailsPoint';
 export * from './DxfLineModel';

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

@@ -1,7 +1,6 @@
 import { DxfSystem } from '../../DxfSystem';
 import * as components from "./components";
 type Option = {
-    detailsPoint?: boolean;
     whiteModel?: boolean;
     dxfLineModel?: boolean;
 };

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

@@ -1,6 +1,4 @@
-export * from './DetailsPointRender';
 export * from './DomContainer';
-export * from './OriginalLineRender';
 export * from './Renderer';
 export * from './ModelDataRender';
 export * from './DomEventRegister';

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

@@ -3,9 +3,7 @@ import { default as Dxf3DView } from './pages/Dxf.vue';
 import * as components from "./components";
 import * as THREE from "three";
 type Option = {
-    originalLine?: boolean;
     modelData?: boolean;
-    detailsPoint?: boolean;
     orbitControls?: boolean;
     camera?: THREE.Camera;
 };

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

@@ -89,7 +89,7 @@ export declare class LineGroupType {
      */
     static remove(line: LineSegment<LineUserData>, id: string): boolean;
     /**
-     * 获取所有线段的交集类型（所有线段都包含的类型）
+     * 通过类型移除
      * @param line
      * @param id
      * @returns

package/src/utils/modelScenario/SceneAutoGenerat.d.ts

@@ -22,10 +22,16 @@ export declare class SceneAutoGenerat {
     /** 构建物品模型
      */
     buildItem(): Promise<void>;
-    static itemParse(item: any, z: number): {
+    static itemParse(item: any): {
         box: THREE.LineSegments<THREE.EdgesGeometry<THREE.ExtrudeGeometry>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
         center: THREE.Vector3;
         category: any;
         angle: number;
+        info: {
+            center: THREE.Vector3;
+            start: THREE.Vector3;
+            end: THREE.Vector3;
+            length: number;
+        }[];
     };
 }

package/src/components/Card.vue.d.ts

@@ -1,9 +0,0 @@
-type __VLS_Props = {
-    message: string;
-};
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    look: (...args: any[]) => void;
-}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onLook?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;

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

@@ -1,77 +0,0 @@
-import { Component, ComponentManager } from '../../ComponentManager';
-import { Dxf } from './Dxf';
-import { Variable } from './Variable';
-import { Quadtree } from '../../Quadtree';
-import { LineSegment } from '../../LineSegment';
-import { Point } from '../../Point';
-import * as THREE from "three";
-type ProjectionAnalysisResult = {
-    source: LineSegment;
-    sourceIndex: number;
-    target: LineSegment;
-    targetIndex: number;
-    project: LineSegment;
-    project2: LineSegment;
-};
-export declare class LineAnalysis extends Component<{
-    analysisCompleted: {};
-}> {
-    static name: string;
-    Dxf: Dxf | null;
-    Variable: Variable | null;
-    lineSegmentList: LineSegment<{
-        isDoor: boolean;
-        isWindow: boolean;
-    }>[];
-    container: THREE.Group<THREE.Object3DEventMap>;
-    errorAngle: number;
-    width: number;
-    /**
-     *
-     * @param parent
-     */
-    onAddFromParent(parent: ComponentManager): void;
-    /**
-     *
-     * @param p1
-     * @param p2
-     * @param width
-     * @returns
-     */
-    expandLineSegment(p1: Point, p2: Point, width?: number): {
-        points: Point<Record<string, any>>[];
-        indices: number[];
-        rectIndices: number[];
-    };
-    appendLineSegmentList: LineSegment[];
-    /**
-     * 追加数据
-     * @param p1
-     * @param p2
-     */
-    addData(p1: Point, p2: Point): void;
-    /** 结果分析创建矩形
-     * @param result
-     */
-    createRectangle(result: ProjectionAnalysisResult): void;
-    quadtree?: Quadtree;
-    /**
-     * 构建线段四叉树，快速查找，
-     */
-    buildQuadtree(): void;
-    resultList: ProjectionAnalysisResult[];
-    mergeWallLines: LineSegment[][];
-    /** 线段分析
-     * @description 判断两条线段距离是否较短且趋近平行，然后查找两条线段的重合部分的投影线，以此判断两根线是否需要合并
-     * @param data
-     */
-    lineAnalysis(): void;
-    /** 线段投影分析
-     * @param index
-     * @param sourceLineSegment
-     * @param lineSegmentList
-     * @returns
-     */
-    private projectionAnalysis;
-}
-export {};