build-dxf 0.0.20-14 → 0.0.20-16

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

@@ -0,0 +1,9 @@
+import { ComponentManager } from '../../ComponentManager';
+import { Dxf } from './Dxf';
+/**
+ * 角度修正过后的DXF格式数据
+ */
+export declare class AngleCorrectionDxf extends Dxf<{}> {
+    static name: string;
+    onAddFromParent(parent: ComponentManager): void;
+}

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

@@ -38,6 +38,7 @@ export interface OriginalDataItem {
         };
     };
     isWindow?: boolean;
+    isVerticalReferenceLine?: boolean;
     drawWindow?: {
         p: {
             x: number;
@@ -52,6 +53,19 @@ export interface OriginalDataItem {
  * [开始点, 结束点, 相交点, 是否是门, 索引]
  */
 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;
+};
 /**
  *
  */
@@ -62,7 +76,7 @@ export interface PointGroup {
 /**
  * 将点云结构转换为DXF格式
  */
-export declare class Dxf extends Component<{
+export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     setDta: {
         originalData: OriginalDataItem[];
         data: DataItem[];
@@ -73,7 +87,7 @@ export declare class Dxf extends Component<{
     createGroup: {
         groups: Point[][][];
     };
-}> {
+} & TEventMap> {
     static name: string;
     shortLine: number;
     width: number;
@@ -89,7 +103,8 @@ export declare class Dxf extends Component<{
     lineSegments: LineSegment<{
         isDoor: boolean;
         isWindow: boolean;
-        drawDoorData: any[];
+        drawDoorData: any;
+        drawWindow: any[];
     }>[];
     originalZAverage: number;
     static EndType: {
@@ -107,7 +122,8 @@ export declare class Dxf extends Component<{
     get lines(): LineSegment<{
         isDoor: boolean;
         isWindow: boolean;
-        drawDoorData: any[];
+        drawDoorData: any;
+        drawWindow: any[];
     }>[];
     /**初始化
      * @param data 点云数据
@@ -175,7 +191,16 @@ export declare class Dxf extends Component<{
      */
     private getArcAngleRange;
     /**
-     * 将点云结构转换为string
+     * 转为绘制数据
+     */
+    toDrawDataJson(unit?: Unit): DrawData;
+    /**
+     *
+     * @param type
+     */
+    toDxfImageBlob(unit?: Unit, type?: string): Promise<any>;
+    /**
+     * 将点json结构转换为Dxf string
      */
     toDxfString(unit?: Unit): string;
     /**
@@ -188,6 +213,11 @@ export declare class Dxf extends Component<{
      * @param filename
      */
     download(filename: string, unit?: Unit): Promise<void>;
+    /**
+     * 下载
+     * @param filename
+     */
+    downloadImage(filename: string, unit?: Unit, type?: string): Promise<boolean>;
     /**
      * 计算原始数据的边界框
      * @description 计算所有线段的起点和终点的最小最大值，形成一个边界框

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

@@ -13,7 +13,9 @@ type ProjectionAnalysisResult = {
     project: LineSegment;
     project2: LineSegment;
 };
-export declare class LineAnalysis extends Component {
+export declare class LineAnalysis extends Component<{
+    analysisCompleted: {};
+}> {
     static name: string;
     Dxf: Dxf | null;
     Variable: Variable | null;

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

@@ -1,8 +1,10 @@
 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";

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

@@ -34,28 +34,34 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @param point
      * @param point2
      */
-    getSamePointAll(point: Point, point2: Point): {
-        point: Point<Record<string, any>>;
-        oldPoint: Point<Record<string, any>>;
-        newPoint: Point<Record<string, any>>;
-        line: LineSegment;
-    }[];
-    /** 修正
-     * @param targettLine
-     * @param vistedList
+    getSamePointAll(point: Point, line: LineSegment): {
+        queryList: {
+            point: Point;
+            userData?: LineSegment<import('..').LineUserData> | undefined;
+        }[];
+        parallelList: {
+            point: Point;
+            userData?: LineSegment<import('..').LineUserData> | undefined;
+        }[];
+    };
+    /**
+     *
+     * @param line
+     * @param point
+     * @param newPoint
      */
-    correction0(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[] | undefined;
+    setLine(line: LineSegment, point: Point, newPoint: Point, record?: any[]): void;
     /** 修正2
      * 第一步：确定需要修复的线段
      * 第二步：查找与该线段相交的其他线段
      * 第三步：找出两端点相交的线段，其他为区间相交
-     * 第四步：找出两端点相交的线段数量，大于2， 该点不能修
-     * 第五步：修正
-     * 第六步：修正同向线段
+     * 第四步：修正相交的线段的另一个端点
+     * 第五步：判断是否有方向一致的线段，有就调整，调整方法：查找连续平行的线段，求点在线段方向的投影，直到不平行的线段结束
+     * 第六步: 中间线段采用投影修正
      * @param targettLine
      * @param vistedList
      */
-    correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[] | undefined;
+    correction(targettLine: LineSegment, entryPoint?: Point, resultList?: any[], vistedList?: Set<LineSegment | Point>): any[] | undefined;
     /** 开始
      * @param next
      */

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

@@ -0,0 +1,21 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 设置垂直基准线段
+ */
+export declare class VerticalReferenceLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /**
+     *
+     * @param next
+     * @param selectLines
+     */
+    private verticalReferenceLine;
+}

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

@@ -1,15 +1,21 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
- * 查看线段角度
+ * 合并同向线段
  */
 export declare class ViewAngle extends CommandFlowComponent<{}> {
     static name: string;
     shortcutKeys: string[];
     static commandName: string;
     onAddFromParent(parent: ComponentManager): void;
-    /** 执行完成
-     * @param data
+    /**
+     * 进入命令约束
      */
-    private completed;
+    private constraint;
+    /**
+     *
+     * @param next
+     * @param selectLines
+     */
+    private viewAngle;
 }

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

@@ -12,11 +12,13 @@ export type LineUserData = {
     doorDirectConnection?: boolean;
     isDoor?: boolean;
     isWindow?: boolean;
-    drawDoorData?: {
+    isVerticalReferenceLine?: boolean;
+    drawWindow?: {
         p: THREE.Vector3;
         width: number;
         full: boolean;
     }[];
+    drawDoorData?: any;
     quadtreeNode?: QuadtreeNode;
 };
 export declare class RenderManager extends Component<{}> {
@@ -29,6 +31,7 @@ export declare class RenderManager extends Component<{}> {
         type: "addLine" | "removeLine";
         data: any;
     }>;
+    verticalReferenceLineFlag: THREE.Mesh<THREE.PlaneGeometry, THREE.MeshBasicMaterial, THREE.Object3DEventMap>;
     onAddFromParent(): void;
     private updatedMode;
     /** 重新设置数据

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

@@ -11,7 +11,25 @@ export declare class LineSegment<T = Record<string, any>> {
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;
     constructor(p1?: Point, p2?: Point);
-    set(p1: Point, p2: Point): void;
+    set(p1: Point, p2: Point): this;
+    /**
+     * 是否有相同端点
+     * @param line
+     * @returns
+     */
+    sameEndpoint(line: LineSegment): boolean;
+    /**
+     * 相同端点是否为开始
+     * @param line
+     * @returns
+     */
+    sameEndpointAsStart(line: LineSegment): boolean;
+    /**
+     * 相同端点是否为结束
+     * @param line
+     * @returns
+     */
+    sameEndpointAsEnd(line: LineSegment): boolean;
     /** 膨胀
      * @description 向线段的两个端点分别膨胀 width
      * @param width

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

@@ -54,6 +54,12 @@ export declare class Point<T = Record<string, any>> {
      * @returns
      */
     add(point: Point): this;
+    /**
+     * 绕point旋转angle
+     * @param point
+     * @param angle 旋转角度，单位为弧度
+     */
+    rotate(point: Point, angle: number): this;
     /**
      * 保留小数位数
      * @param count
@@ -124,7 +130,7 @@ export declare class Point<T = Record<string, any>> {
     copy(p: {
         x: number;
         y: number;
-    }): void;
+    }): this;
     toJson(z?: number): {
         x: number;
         y: number;

package/src/utils/deepClone.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 实现深度克隆函数
+ * @param value 要克隆的值
+ * @returns 克隆后的新对象
+ */
+export declare function deepClone<T>(value: T): T;