build-dxf 0.0.20-9 → 0.0.21

package/src/utils/CommandManager/CommandFlow.d.ts

@@ -18,10 +18,23 @@ export declare class CommandFlow extends EventDispatcher<{
     finally: {};
 }> {
     list: CommandFlowCallBack[];
-    rollbacklist: CommandFlowCallBack[];
-    revokeList: CommandFlowCallBack[];
+    rollbacklist: ((data?: any) => void)[];
+    revokeRollbacklist: ((data?: any) => void)[];
+    writeOperationList: boolean;
+    /**
+     *
+     * @param operation
+     * @returns
+     */
     add(operation: CommandFlowCallBack): this;
-    addRollback(callBack: (data?: any) => void): void;
-    addRevoke(callBack: (data?: any) => void): void;
+    /** 添加回滚回调列表
+     * @param callBack
+     */
+    addRollback(callBack: (data?: any) => void): this;
+    /** 添加撤回回滚回调列表
+     * @param callBack
+     * @returns
+     */
+    addRevokeRollback(callBack: (data?: any) => void): this;
 }
 export {};

package/src/utils/CommandManager/CommandManager.d.ts

@@ -35,6 +35,12 @@ export declare class CommandManager extends EventDispatcher<{
     finally: {
         name: string;
     };
+    rollback: {
+        name: string;
+    };
+    revokeRollback: {
+        name: string;
+    };
 }> {
     commandFlowMap: Map<string, CommandFlow>;
     lock: boolean;
@@ -68,6 +74,9 @@ export declare class CommandManager extends EventDispatcher<{
     /**
      * 回滚
      */
-    rollback(): void;
-    revoke(): void;
+    rollback(): boolean;
+    /**
+     * 撤销回滚
+     */
+    revokeRollback(): boolean;
 }

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

@@ -0,0 +1,10 @@
+import { ComponentManager } from '../../ComponentManager';
+import { Dxf } from './Dxf';
+/**
+ * 角度修正过后的DXF格式数据
+ */
+export declare class AngleCorrectionDxf extends Dxf<{}> {
+    static name: string;
+    onAddFromParent(parent: ComponentManager): void;
+    update(): Promise<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, background?: 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/ClippingLine.d.ts

@@ -0,0 +1,45 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { ComponentManager } from '../../../../../ComponentManager';
+import * as THREE from "three";
+export declare class ClippingLine extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    commandName: string;
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 选择开始点
+     * @param next
+     */
+    selectPointStart(next: any): void;
+    /** 选择结束点
+     * @param next
+     */
+    selectPointEnd(next: any, { point, line }: {
+        point: THREE.Vector3;
+        line: LineSegment;
+    }): void;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
+    /** 执行完成
+     */
+    completed(data: any): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -12,8 +12,22 @@ export declare class ConnectionLine extends CommandFlowComponent<{}> {
      * 进入命令约束
      */
     private constraint;
-    /** 开始
+    /** 连接
      * @param next
      */
     private connection;
+    /** 成功
+     * @param next
+     * @param selectLines
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -16,4 +16,13 @@ export declare class DeleteSelectLine extends CommandFlowComponent<{}> {
      * @param next
      */
     private delete;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -15,5 +15,19 @@ export declare class DeleteSelectWindow extends CommandFlowComponent<{}> {
     /** 开始
      * @param next
      */
-    private connection;
+    private end;
+    /**
+     * 完成
+     * @param list
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,8 +1,11 @@
 import { ComponentManager } from '../../../../../ComponentManager';
-import { Point } from '../../../../../Quadtree/Point';
 import { CommandFlowComponent } from './CommandFlowComponent';
 import * as THREE from "three";
-export declare class DrawDoorLine extends CommandFlowComponent<{}> {
+export declare class DrawDoorLine extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -12,8 +15,23 @@ export declare class DrawDoorLine extends CommandFlowComponent<{}> {
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    completed(data: any[]): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,8 +1,11 @@
-import { Point } from '../../../../../Quadtree/Point';
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class DrawLine extends CommandFlowComponent<{}> {
+export declare class DrawLine extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -14,8 +17,21 @@ export declare class DrawLine extends CommandFlowComponent<{}> {
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /** 结束， 汇总结果
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,8 +1,13 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class DrawWindow extends CommandFlowComponent<{}> {
+export declare class DrawWindow extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -20,7 +25,25 @@ export declare class DrawWindow extends CommandFlowComponent<{}> {
         point: THREE.Vector3;
         line: LineSegment;
     }): void;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(data: any): void;
+    completed({ doorDataItem, line }: {
+        doorDataItem: any;
+        line: LineSegment<LineUserData>;
+    }): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -16,4 +16,18 @@ export declare class IntersectionConnectionLine extends CommandFlowComponent<{}>
      * @param next
      */
     private connection;
+    /** 执行完成
+     * @param next
+     * @param selectLines
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 合并同向线段
+ */
+export declare class MergeLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     * @todo 合并所有
+     */
+    private mergeLine;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -2,7 +2,11 @@ import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class PointDrag extends CommandFlowComponent<{}> {
+export declare class PointDrag extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -25,4 +29,13 @@ export declare class PointDrag extends CommandFlowComponent<{}> {
     /** 执行完成
      */
     completed(data: any): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,5 +1,6 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import * as THREE from "three";
 /**
  * 选择全部命令
@@ -14,4 +15,16 @@ export declare class SelectAll extends CommandFlowComponent<{}> {
      * @param next
      */
     selectAll(next: any): void;
+    /** 执行完成
+     */
+    completed(lines: LineSegment[]): void;
+    /** 回滚操作
+     * @param lines
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -0,0 +1,82 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { Point } from '../../../../../Quadtree/Point';
+import * as THREE from "three";
+/**
+ * 垂直纠正
+ */
+export declare class VerticalCorrection extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    shortcutKeys2: string[];
+    static commandName: string;
+    recursion: boolean;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    constraint(next: any, selectLines: LineSegment[]): void;
+    /**
+     * 线段是否为结尾线段
+     * @param line
+     */
+    lineIsPathEnd(line: LineSegment): boolean;
+    /**
+     *
+     * @param line0
+     * @param line1
+     */
+    isTowLineSegmentConnect(line0: LineSegment, line1: LineSegment): boolean;
+    /**
+     * 获取所有相同点的位置信息
+     * @param point
+     * @param point2
+     */
+    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
+     */
+    setLinePoint(line: LineSegment, newStartPoint?: Point, newEndPoint?: Point, mode?: "start" | "end" | "all", record?: any[]): void;
+    /** 修正2
+     * 第一步：确定需要修复的线段
+     * 第二步：查找与该线段相交的其他线段
+     * 第三步：找出两端点相交的线段，其他为区间相交
+     * 第四步：修正相交的线段的另一个端点
+     * 第五步：判断是否有方向一致的线段，有就调整，调整方法：查找连续平行的线段，求点在线段方向的投影，直到不平行的线段结束
+     * 第六步: 中间线段采用投影修正
+     * @param targettLine
+     * @param vistedList
+     */
+    correction(targettLine: LineSegment, entryPoint?: Point, resultList?: any[], vistedList?: Set<LineSegment | Point>): any[] | undefined;
+    /** 开始
+     * @param next
+     */
+    verticalCorrection(next: any, selectLines: LineSegment[]): void;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -2,6 +2,7 @@ import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { Point } from '../../../../../Quadtree/Point';
+import { LineUserData } from '../RenderManager';
 import * as THREE from "three";
 /**
  * 垂直纠正
@@ -10,7 +11,9 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     shortcutKeys: string[];
+    shortcutKeys2: string[];
     static commandName: string;
+    recursion: boolean;
     onAddFromParent(parent: ComponentManager): void;
     /**
      * 进入命令约束
@@ -22,18 +25,51 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      */
     lineIsPathEnd(line: LineSegment): boolean;
     /**
-     * 设置所有相同点的位置
-     * @param point
-     * @param point2
+     *
+     * @param line0
+     * @param line1
      */
-    setPointAll(point: Point, point2: Point): void;
-    /** 修正
-     * @param selectLine
+    isTowLineSegmentConnect(line0: LineSegment, line1: LineSegment): boolean;
+    /**
+     *
+     * @param line
+     * @param newStartPoint
+     * @param newEndPoint
+     * @param mode 需要匹配的点
+     * @param record
+     * @param id
+     * @returns
+     */
+    setLinePoint(line: LineSegment, newStartPoint: Point, newEndPoint: Point, mode?: "start" | "end" | "all" | "none", resultList?: any[], id?: string): {
+        point: Point;
+        userData?: LineSegment<LineUserData>;
+    }[];
+    /** 修正2
+     * 第一步：确定需要修复的线段
+     * 第二步：查找与该线段相交的其他线段
+     * 第三步：找出两端点相交的线段，其他为区间相交
+     * 第四步：修正相交的线段的另一个端点
+     * 第五步：判断是否有方向一致的线段，有就调整，调整方法：查找连续平行的线段，求点在线段方向的投影，直到不平行的线段结束
+     * 第六步: 中间线段采用投影修正
+     * @param targettLine
      * @param vistedList
      */
-    correction(selectLine: LineSegment, vistedList?: Set<LineSegment>): Set<LineSegment<Record<string, any>>> | undefined;
+    correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[];
     /** 开始
      * @param next
      */
     verticalCorrection(next: any, selectLines: LineSegment[]): void;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }