build-dxf 0.1.9 → 0.1.11

package/src/index.css

@@ -574,6 +574,10 @@
   filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
 }
 
+.filter {
+  filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+}
+
 .transition {
   transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, visibility, content-visibility, overlay, pointer-events;
   transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -806,7 +810,7 @@
   inherits: false
 }
 
-[data-v-8028c98c] {
+[data-v-18ae0c97] {
     font-family: 宋体;
 }
 

package/src/index3.js

@@ -7688,7 +7688,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         localStorage.setItem("lines", JSON.stringify(lines));
         try {
           dxfSystem.Dxf.set(lines);
-          dxfSystem.Dxf.lineOffset();
         } catch (error) {
           console.log(error);
         }
@@ -7908,7 +7907,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     drawLine.addEventListener("start", () => drawLineCount.value = 0);
     drawLine.addEventListener("appendLine", (e) => drawLineCount.value = e.points.length);
     drawLine.addEventListener("revoke", (e) => drawLineCount.value = e.points.length);
-    dxfSystem.Dxf.addEventListener("setDta", () => {
+    dxfSystem.Dxf.addEventListener("dataChange", () => {
       z.value = dxfSystem.Dxf.originalZAverage;
     });
     const startedEventCancel = editor.commandManager.addEventListener("started", (e) => {
@@ -7989,7 +7988,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onMousedown: dragMoveHelper,
             class: normalizeClass([{ "border-b-[#eee] border-b-1": toolBarExpand.value }, "flex flex-row justify-between header text-[14px] font-bold p-[10px 0px]"])
           }, [
-            _cache[13] || (_cache[13] = createStaticVNode('<div class="flex flex-row" data-v-8028c98c><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-8028c98c><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-8028c98c><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-8028c98c></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-8028c98c>绘制工具</h5></div>', 1)),
+            _cache[13] || (_cache[13] = createStaticVNode('<div class="flex flex-row" data-v-18ae0c97><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-18ae0c97><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-18ae0c97><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-18ae0c97></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-18ae0c97>绘制工具</h5></div>', 1)),
             createElementVNode("div", {
               onMousedown: _cache[0] || (_cache[0] = (e) => e.stopPropagation()),
               onClick: _cache[1] || (_cache[1] = ($event) => toolBarExpand.value = !toolBarExpand.value),
@@ -8229,7 +8228,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8028c98c"]]);
+const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-18ae0c97"]]);
 class Editor extends Component {
   static name = "Editor";
   container = new THREE.Group();

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

@@ -1,73 +1,13 @@
-import { Component } from '../../ComponentManager';
-import { Box2 } from '../../Box2';
-import { LineSegment } from '../../LineSegment';
-import { Quadtree } from '../../Quadtree';
-import { SetDataOption, DataItem, LineUserData, OriginalDataItem, Unit } from '../type';
-import { CAD } from '../utils/CAD';
+import { SetDataOption, OriginalDataItem } from '../type';
 import { DxfSystem } from '../DxfSystem';
-type PreProcessor = (lines: LineSegment[], option: SetDataOption) => LineSegment[];
-export declare const PRE_PROCESSOR: Record<"DoorsAnalysis" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter", PreProcessor>;
+import { Dxf } from './Dxf';
 /**
  * 将点云结构转换为DXF格式
  */
-export declare class CorrectionDxf<TEventMap extends {} = {}> extends Component<{
-    dataChange: {
-        originalData: OriginalDataItem[];
-        data: DataItem[];
-        cad: CAD;
-    };
-    cadChange: {
-        cad: CAD;
-    };
-    preprocessing: {
-        data: OriginalDataItem[];
-        setData(data: OriginalDataItem[]): void;
-    };
-} & TEventMap> {
+export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & TEventMap> {
     static name: string;
-    static readonly PRE_PROCESSOR: Record<"DoorsAnalysis" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter", PreProcessor>;
-    width: number;
-    originalData: OriginalDataItem[];
-    data: DataItem[];
-    box: Box2;
-    cad: CAD | null;
-    lineSegments: LineSegment<LineUserData>[];
-    doorLineSegment: LineSegment[];
-    verticalReferenceLine?: LineSegment<LineUserData>;
-    originalZAverage: number;
-    private _preProcessorSet;
-    trajectory: Record<string, any> | null;
-    onBoundExt?: (lines: LineSegment[], trajectory: any) => void;
-    /** 原始数据组
-     */
-    get lines(): LineSegment<LineUserData>[];
-    /**初始化
-     * @param width 墙体宽度
-     */
-    constructor(width?: number);
-    setTrajectory(trajectory: Record<string, any> | null, onBoundExt?: (lines: LineSegment[], trajectory: any) => void): this;
+    static readonly PRE_PROCESSOR: Record<"DoorsAnalysis" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter", (lines: import('../..').LineSegment[], option: SetDataOption) => import('../..').LineSegment[]>;
     onAddFromParent(parent: DxfSystem): void;
-    /** 完整线段数据
-     * @returns
-     */
-    getLineSegments(clone?: boolean): LineSegment<LineUserData>[];
-    /**
-     * 预处理数据
-     * @param data
-     */
-    private preprocessing;
-    /** 添加预处理
-     * @param handler
-     */
-    addPreProcessor(handler: PreProcessor): this;
-    /** 删除预处理
-     * @param handler
-     */
-    removePreProcessor(handler: PreProcessor): this;
-    /** 清空预处理
-     * @returns
-     */
-    clearPreProcessor(): this;
     /** 设置
      * @param data 房屋结构数据，node环境可以为路径
      * @param width 墙体宽度
@@ -76,51 +16,5 @@ export declare class CorrectionDxf<TEventMap extends {} = {}> extends Component<
      * @param option
      * @returns
      */
-    set(data: OriginalDataItem[], options?: SetDataOption): void;
-    /**
-     * 线段数据转为原始json数据
-     */
-    lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
-    /**
-   * 下载原始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>;
-    /** 下载 dxf 图片
-     * @param filename
-     */
-    downloadDxfImage(filename: string, unit?: Unit, type?: string): Promise<boolean | undefined>;
-    /**
-     * 将点json结构转换为Dxf 字符串
-     */
-    toDxfString(unit?: Unit): string | undefined;
-    /**
-     * 将点云结构转换为 DXF 二进制对象
-     * @returns
-     */
-    toDxfBlob(unit?: Unit): Blob | undefined;
-    /** 下载Dxf
-     * @param filename
-     */
-    downloadDxf(filename: string, unit?: Unit): Promise<void | undefined>;
+    set(data: OriginalDataItem[], options?: SetDataOption): any;
 }
-export {};

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

@@ -53,7 +53,10 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      * 预处理数据
      * @param data
      */
-    private preprocessing;
+    protected preprocessing(data: OriginalDataItem[], options: SetDataOption): {
+        lineSegments: LineSegment<LineUserData>[];
+        data: OriginalDataItem[];
+    };
     /** 添加预处理
      * @param handler
      */
@@ -89,6 +92,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     toDrawData(unit?: Unit): {
         unit: Unit;
         lines: [number, number, number, number, string][];
+        lines2: [number, number, number, number, string][];
         arcs: [number, number, number, number, number, string][];
         texts: [string, number, number, string][];
         center: {

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

@@ -7,6 +7,7 @@ type EndType = "etOpenSquare" | "etOpenButt" | "etOpenRound";
 type DrawData = {
     unit: Unit;
     lines: [number, number, number, number, string][];
+    lines2: [number, number, number, number, string][];
     arcs: [number, number, number, number, number, string][];
     texts: [string, number, number, string][];
     center: {

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

@@ -95,6 +95,13 @@ export declare class LineGroupType {
      * @returns
      */
     static removeByType(line: LineSegment<LineUserData>, type: string): boolean;
+    /**
+     * 通过类型移除
+     * @param line
+     * @param id
+     * @returns
+     */
+    static removeByTypes(line: LineSegment<LineUserData>, types: string[]): void;
     /**
      * 清空线段的所有分组信息
      * @param line

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

@@ -1,183 +0,0 @@
-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[];
-}