build-dxf 0.0.37 → 0.0.39

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

@@ -8,6 +8,7 @@ export declare class DxfSystem extends ComponentManager {
     Variable: Variable;
     wallWidth: number;
     environment: "node" | "browser" | "unknown";
+    static finalInstance?: DxfSystem;
     /** 构造函数
      * @param wallWidth 输出墙壁厚度，该墙壁厚度不受缩放影响
      * @param scale 原始数据缩放比例

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 } 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;

package/src/utils/DxfSystem/plugin/RenderPlugin/pages/Dxf.vue.d.ts

@@ -1,4 +1,4 @@
-import { OriginalDataItem } from '../../../components/Dxf';
+import { OriginalDataItem } from '../../../type';
 type __VLS_Props = {
     lines?: OriginalDataItem[];
     detailsPoint?: {

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

@@ -38,7 +38,7 @@ export interface OriginalDataItem {
     };
     wallWidth?: number;
     isWindow?: boolean;
-    rooftopPz: number;
+    rooftopPz?: number;
     isVerticalReferenceLine?: boolean;
     drawWindow?: {
         p: {
@@ -56,7 +56,7 @@ export type LineUserData = {
     isWindow?: boolean;
     isVerticalReferenceLine?: boolean;
     wallWidth?: number;
-    rooftopPz: number;
+    rooftopPz?: number;
     drawWindow?: {
         p: THREE.Vector3;
         width: number;
@@ -82,20 +82,37 @@ export type DrawData = {
     height: number;
     scale: number;
 };
+export type FittingMethodType = "average" | "max";
 export type AxisAlignmentCorrectionOption = {
     /**
-     * 主轴阈值，默认 0.3
+     * 主轴阈值，默认 0.3 groupMethod是precision时生效
      */
     principalAxisThreshold?: number;
     /**
-     * 交叉轴阈值，默认 0.05
+     * 交叉轴阈值，默认 0.06
      */
     crossAxistThreshold?: number;
     /**
      * 吸附阈值，默认 0.2
      */
     snapThreshold?: number;
-    groupMethod?: "precision" | "default";
+    /**
+     * 拟合方式, 默认 max
+     * @description average 以分组线段平均数作为拟合位置
+     * @description max 以分组线段中最长线段作为拟合位置
+     */
+    fittingMethod?: FittingMethodType;
+    /**
+     * 分组方式, 默认 default
+     * @description cross 以交叉轴辅助分组
+     * @description principalAndCross 以主轴和交叉轴辅助分组
+     * @description originalInterPoint 通过原始交点计算分组，把原来平行的放到分组里
+     */
+    groupMethod?: "cross" | "principalAndCross" | "originalInterPoint";
+    /**
+     * 吸附方式, 默认 adsorption
+     */
+    adsorptionMethod?: "originalInterPoint" | "adsorption";
 };
 /**
  *

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/lineSegmentClipping.d.ts

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

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