build-dxf 0.0.36 → 0.0.38

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

@@ -0,0 +1,19 @@
+import { ComponentManager } from '../ComponentManager';
+import { AngleCorrectionDxf } from './components/AngleCorrectionDxf';
+import { Dxf } from './components/Dxf';
+import { Variable } from './components/Variable';
+export declare class DxfSystem extends ComponentManager {
+    Dxf: Dxf;
+    AngleCorrectionDxf: AngleCorrectionDxf;
+    Variable: Variable;
+    wallWidth: number;
+    environment: "node" | "browser" | "unknown";
+    static finalInstance?: DxfSystem;
+    /** 构造函数
+     * @param wallWidth 输出墙壁厚度，该墙壁厚度不受缩放影响
+     * @param scale 原始数据缩放比例
+     */
+    constructor(wallWidth?: number, scale?: number);
+    usePlugin(plugin: (this: DxfSystem, dxfSystem: DxfSystem) => void): this;
+    destroy(): void;
+}

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

@@ -2,108 +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: {
-        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;
-};
-type AxisAlignmentCorrectionOption = {
-    /**
-     * 主轴阈值，默认 0.3
-     */
-    principalAxisThreshold?: number;
-    /**
-     * 交叉轴阈值，默认 0.05
-     */
-    crossAxistThreshold?: number;
-    /**
-     * 吸附阈值，默认 0.2
-     */
-    snapThreshold?: number;
-};
-/**
- *
- */
-export interface PointGroup {
-    points: Point[];
-    indices: number[];
-}
+import { Quadtree } from '../../Quadtree/Quadtree';
+import { AxisAlignmentCorrectionOption, DataItem, DrawData, LineUserData, OriginalDataItem, Unit } from '../type';
 /**
  * 将点云结构转换为DXF格式
  */
@@ -159,7 +59,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * 预处理数据
      * @param data
      */
-    preprocessing(data: OriginalDataItem[], axisAlignmentCorrection?: boolean, option?: AxisAlignmentCorrectionOption): {
+    preprocessing(data: OriginalDataItem[], isAxisAlignCorr?: boolean, option?: AxisAlignmentCorrectionOption): {
         lineSegments: LineSegment<LineUserData>[];
         data: OriginalDataItem[];
     };
@@ -171,7 +71,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @param option
      * @returns
      */
-    set(data: OriginalDataItem[] | string, width?: number, scale?: number, axisAlignmentCorrection?: boolean, option?: AxisAlignmentCorrectionOption): Promise<any>;
+    set(data: OriginalDataItem[] | string, width?: number, scale?: number, isAxisAlignCorr?: boolean, option?: AxisAlignmentCorrectionOption): Promise<any>;
     /** 创建分组
      * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
      * @returns
@@ -267,44 +167,10 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * @returns
      */
     private computedOriginalSize;
-    get boundaryExtension(): typeof Dxf.boundaryExtension;
-    /**
-     * 线段数据转为原始json数据
-     */
-    static lineDataToOriginalData(lines: LineSegment<LineUserData>[], originalZAverage?: number, quadtree?: Quadtree): OriginalDataItem[];
     /**
      * 创建数据
      * @param pointsGroups
      * @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 待调整线段组
-     * @param targettLine 轴线段
-     * @returns
-     */
-    static axisAlignmentCorrection(lines: LineSegment[], targettLine: LineSegment, option?: AxisAlignmentCorrectionOption): LineSegment<LineUserData>[];
-    /** 查找外墙
-     * @param lines
-     * @param trajectoryPoints
-     * @returns
-     */
-    static findExteriorWall(lines: LineSegment[], trajectoryPoints: Point[], minWidth?: number): LineSegment<Record<string, any>>[];
-    /** 边线外扩
-     * @param lines
-     * @param trajectoryPoints
-     */
-    static boundaryExtension(data: OriginalDataItem[], trajectory: any, wallWidth?: number): OriginalDataItem[];
 }
-export {};

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

@@ -1,18 +1,2 @@
-import { ComponentManager } from '../ComponentManager';
-import { AngleCorrectionDxf } from './components/AngleCorrectionDxf';
-import { Dxf } from './components/Dxf';
-import { Variable } from './components/Variable';
-export declare class DxfSystem extends ComponentManager {
-    Dxf: Dxf;
-    AngleCorrectionDxf: AngleCorrectionDxf;
-    Variable: Variable;
-    wallWidth: number;
-    environment: "node" | "browser" | "unknown";
-    /** 构造函数
-     * @param wallWidth 输出墙壁厚度，该墙壁厚度不受缩放影响
-     * @param scale 原始数据缩放比例
-     */
-    constructor(wallWidth?: number, scale?: number);
-    usePlugin(plugin: (this: DxfSystem, dxfSystem: DxfSystem) => void): this;
-    destroy(): void;
-}
+export * from './DxfSystem';
+export * as utils from './utils';

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

@@ -1,6 +1,6 @@
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { CommandFlowComponent } from './CommandFlowComponent';
-import { LineUserData } from '../../../../components/Dxf';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 export declare class Default extends CommandFlowComponent<{
     selectLineChange: {};

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

@@ -1,7 +1,7 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
-import { LineUserData } from '../../../../components/Dxf';
 import { ComponentManager } from '../../../../../ComponentManager';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 export declare class DrawWindow extends CommandFlowComponent<{
     pointerMove: {

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

@@ -2,7 +2,7 @@ import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { Point } from '../../../../../Quadtree/Point';
-import { LineUserData } from '../../../../components/Dxf';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 /**
  * 垂直纠正
@@ -53,7 +53,7 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @returns
      */
     axisAlignmentCorrection(targettLine: LineSegment): {
-        newLines: LineSegment<LineUserData>[];
+        newLines: LineSegment<any>[];
         oldLines: LineSegment<LineUserData>[];
     };
     /** 开始

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

@@ -1,12 +1,13 @@
 import { LineSegment } from '../../../../Quadtree/LineSegment';
 import { Component } from '../../../../ComponentManager';
-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 } from '../../../../Quadtree/Quadtree';
 import { DxfLineModel } from '../../ModelDataPlugin/components';
+import { LineUserData, OriginalDataItem } from '../../../type';
+import { Dxf } from '../../../components/Dxf';
 import * as THREE from "three";
 export declare class RenderManager extends Component<{}> {
     static name: string;
@@ -46,12 +47,7 @@ export declare class RenderManager extends Component<{}> {
      * @param point
      * @returns
      */
-    adsorption(radius?: number, pointVirtualGrid?: PointVirtualGrid<LineSegment<LineUserData>>, quadtree?: Quadtree<any>): {
-        point: THREE.Vector3;
-        find: boolean;
-        mode: string;
-        line: LineSegment<LineUserData>;
-    } | {
+    adsorption(radius?: number, _?: PointVirtualGrid<LineSegment<LineUserData>>, quadtree?: Quadtree<any>): {
         point: THREE.Vector3;
         find: boolean;
         mode: string;

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

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

package/src/utils/DxfSystem/plugin/Editor/pages/EditorTool.vue.d.ts

@@ -1,4 +1,4 @@
-import { DxfSystem } from '../../..';
+import { DxfSystem } from '../../../DxfSystem';
 type __VLS_Props = {
     dxfSystem: DxfSystem;
     permission?: "admin";

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

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

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

@@ -87,5 +87,12 @@ export declare class Renderer extends Component<{
      * @param count
      */
     createLineSegments(map: Record<string, number[]> | LineSegment[], count: number, parameters?: THREE.LineBasicMaterialParameters, parent?: THREE.Object3D): THREE.LineSegments;
+    /** 创建点
+     * @param point
+     * @param parameters
+     * @param parent
+     * @returns
+     */
+    createCircle(point: Point, parameters?: THREE.PointsMaterialParameters, parent?: THREE.Object3D): THREE.Points<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.PointsMaterial, THREE.Object3DEventMap>;
     destroy(): void;
 }

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

@@ -1,4 +1,4 @@
-import { DxfSystem } from '../..';
+import { DxfSystem } from '../../DxfSystem';
 import { default as Dxf3DView } from './pages/Dxf.vue';
 import * as components from "./components";
 import * as THREE from "three";

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

@@ -0,0 +1,123 @@
+import { QuadtreeNode } from '../Quadtree/Quadtree';
+import { Point } from '../Quadtree/Point';
+import * as THREE from "three";
+export 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;
+    rooftopPz?: number;
+    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;
+    rooftopPz?: 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 type FittingMethodType = "average" | "max";
+export type AxisAlignmentCorrectionOption = {
+    /**
+     * 主轴阈值，默认 0.3 groupMethod是precision时生效
+     */
+    principalAxisThreshold?: number;
+    /**
+     * 交叉轴阈值，默认 0.06
+     */
+    crossAxistThreshold?: number;
+    /**
+     * 吸附阈值，默认 0.2
+     */
+    snapThreshold?: number;
+    /**
+     * 拟合方式, 默认 max
+     * @description average 以分组线段平均数作为拟合位置
+     * @description max 以分组线段中最长线段作为拟合位置
+     */
+    fittingMethod?: FittingMethodType;
+    /**
+     * 分组方式, 默认 default
+     * @description cross 以交叉轴辅助分组
+     * @description principalAndCross 以主轴和交叉轴辅助分组
+     * @description originalInterPoint 通过原始交点计算分组，把原来平行的放到分组里
+     */
+    groupMethod?: "cross" | "principalAndCross" | "originalInterPoint";
+    /**
+     * 吸附方式, 默认 adsorption
+     */
+    adsorptionMethod?: "originalInterPoint" | "adsorption";
+};
+/**
+ *
+ */
+export interface PointGroup {
+    points: Point[];
+    indices: number[];
+}

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

@@ -0,0 +1,14 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { AxisAlignmentCorrectionOption, LineUserData } from '../type';
+/**
+ * 轴对齐垂直纠正类
+ */
+export declare class AxisAlignCorr {
+    /**
+     * 轴对齐垂直修正
+     * @param lines 待调整线段组
+     * @param targettLine 轴线段
+     * @returns
+     */
+    static correction(lines: LineSegment<LineUserData>[], targettLine: LineSegment<LineUserData>, option?: AxisAlignmentCorrectionOption): LineSegment<any>[];
+}

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

@@ -0,0 +1,16 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { Point } from '../../Quadtree/Point';
+import { OriginalDataItem } from '../type';
+export declare class BoundExt {
+    /** 通过轨迹点查找外墙
+     * @param lines
+     * @param trajectoryPoints
+     * @returns
+     */
+    static findExtWallByTraj(lines: LineSegment[], trajectoryPoints: Point[], minWidth?: number): LineSegment<Record<string, any>>[];
+    /** 通过轨迹点外扩边线
+     * @param lines
+     * @param trajectoryPoints
+     */
+    static boundExtbyTraj(data: OriginalDataItem[], trajectory: any, wallWidth?: number): OriginalDataItem[];
+}

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

@@ -0,0 +1,2 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+export declare function findVerticalReference(lineSegments: LineSegment[]): LineSegment<Record<string, any>>;

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

@@ -0,0 +1,5 @@
+export * from './AxisAlignCorr';
+export * from './BoundExt';
+export * from './lineDataToOriginalData';
+export * from './lineSegmentClipping';
+export * from './recomputedWindow';

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

@@ -0,0 +1,7 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { LineUserData, OriginalDataItem } from '../type';
+import { Quadtree } from '../../Quadtree/Quadtree';
+/**
+ * 线段数据转为原始json数据
+ */
+export declare function lineDataToOriginalData(lines: LineSegment<LineUserData>[], originalZAverage?: number, quadtree?: Quadtree): OriginalDataItem[];

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

@@ -0,0 +1,8 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { LineUserData } from '../type';
+/** 根据交点，对线段进行裁剪
+ * @param lines
+ * @param minLen
+ * @returns
+ */
+export declare function lineSegmentClipping(lines: LineSegment<LineUserData>[], minLen?: number): LineSegment<LineUserData>[];

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

@@ -0,0 +1,7 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { LineUserData } from '../type';
+/**
+ * 重新计算窗户
+ * @param windowLines
+ */
+export declare function recomputedWindow(...windowLines: LineSegment<LineUserData>[]): void;

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

@@ -130,10 +130,16 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     directionEqual(line: LineSegment, errAngle?: number): boolean;
     /**
-     * 两条线段是否平行
+     * 两条线段或角度是否平行
      * @param line
      */
-    parallel(line: LineSegment, errAngle?: number): boolean;
+    parallel(angle: LineSegment | number, errAngle?: number): boolean;
+    /** 两条线段或角度是否 垂直
+     * @param line
+     * @param errAngle
+     * @returns
+     */
+    vertical(angle: LineSegment | number, errAngle?: number): boolean;
     /**
      * 两条线段方向相反否一致
      * @param line
@@ -179,6 +185,11 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param selectLines
      */
     static groupBySamePointAndParallel(selectLines: LineSegment[]): LineSegment<Record<string, any>>[][];
+    /** 合并线段到最长线段
+     * @param lines
+     * @returns
+     */
+    static mergeLinesByMaxlength(...lines: LineSegment[]): LineSegment<Record<string, any>>;
     /** 合并平行线段
      * @param lines
      * @returns