build-dxf 0.1.93 → 0.1.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.93",
+  "version": "0.1.94",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -48,4 +48,3 @@
   "license": "UNLICENSED"
 }
 
-

package/src/build.js

@@ -3142,7 +3142,7 @@ class LineSegmentUtils {
     const parallelLines = [], otherLines = [];
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i];
-      if (axisLine.isPerpendicularTo(line, errAngle)) parallelLines.push(line);
+      if (axisLine.isParallelTo(line, errAngle)) parallelLines.push(line);
       else otherLines.push(line);
     }
     return [parallelLines, otherLines];
@@ -18955,22 +18955,26 @@ function vertical(line, baseline) {
   return line;
 }
 class AxisAlignCorr {
-  static start(lines, targettLine) {
-    return new AxisAlignCorr(lines, targettLine).start();
+  static start(lines, targettLine, excludeLines) {
+    return new AxisAlignCorr(lines, targettLine, excludeLines).start();
   }
   lines;
   baseline;
+  excludeLines;
   grid;
-  constructor(lines, baseline) {
+  constructor(lines, baseline, excludeLines) {
     this.lines = lines;
     this.baseline = baseline;
+    this.excludeLines = excludeLines ?? [];
     this.grid = createPointVirtualGrid(lines);
   }
   visited = /* @__PURE__ */ new Set();
   newLines = [];
   start() {
+    const excludeSet = new Set(this.excludeLines);
     for (let i = 0; i < this.lines.length; i++) {
       const line = this.lines[i];
+      if (excludeSet.size && excludeSet.has(line)) continue;
       if (this.visited.has(line)) continue;
       this.correction(line);
     }
@@ -19380,7 +19384,6 @@ function breakpointMerging(lines) {
   return [...defaultLines, ...doorLines];
 }
 function correction(lines, targettLine, option) {
-  lines = lines.map((line) => line.clone());
   lines = breakpointMerging(lines);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = preprocessing(lines);
@@ -19389,8 +19392,8 @@ function correction(lines, targettLine, option) {
   lines = lineSegmentClipping(lines, 1e-9);
   lines = removeDangline(lines, 0.1, false);
   lines = linesSmoothing(lines);
-  let newLines = lines.filter((line) => !line.userData.isDoor);
-  let doorLines = lines.filter((line) => line.userData.isDoor);
+  let newLines = lines.filter((line) => !line.userData.isDoor && !line.userData.isBalconyRailing);
+  let doorLines = lines.filter((line) => line.userData.isDoor || line.userData.isBalconyRailing);
   newLines = buildBayWindowGroup(newLines, false);
   const { wallGroup = true } = option ?? {};
   if (wallGroup) {
@@ -19401,9 +19404,7 @@ function correction(lines, targettLine, option) {
   new WallInsertObject(newLines).recomputed().merge();
   newLines.push(...doorLines);
   newLines = removeDangline(newLines, 0.15, true);
-  TEST = true;
   newLines = linesSmoothing(newLines);
-  TEST = false;
   return newLines.filter((line) => line.length() > 1e-9);
 }
 function axisAlignCorr(lines, option, verticalReferenceLine) {
@@ -19436,7 +19437,7 @@ function boundExt(lines, { trajectory: trajectory2, onBoundExt }) {
 }
 function doubleWallAlignment(lines) {
   const singleWall = lines.filter((line) => !LineGroupType.hasType(line, "doubleWall") && !line.userData.isDoor), doorLines = lines.filter((line) => line.userData.isDoor), grid = createPointVirtualGrid(singleWall.filter((line) => !line.userData.isDoor)), allGrid = createPointVirtualGrid(lines), doubleWalls = LineGroupType.getGroupsByType(lines, "doubleWall"), offset = -DEFAULT_WALL_WIDTH * 0.5, tree = createQuadtree(doubleWalls.flat());
-  const newDoubleWalls = doubleWalls.flatMap((doubleWall, i) => {
+  const newDoubleWalls = doubleWalls.flatMap((doubleWall) => {
     const poly = Polygon.fromByLines2(doubleWall);
     Polygon.ensureCCW(poly);
     let doubleWall_ = poly.toLines();
@@ -19450,8 +19451,8 @@ function doubleWallAlignment(lines) {
     });
     const expLines = doubleWall.filter((line) => {
       if (line.length() < 1e-3) return false;
-      for (let i2 = 0; i2 < line.points.length; i2++) {
-        const point2 = line.points[i2];
+      for (let i = 0; i < line.points.length; i++) {
+        const point2 = line.points[i];
         let list = grid.queryPoint(point2);
         if (list.length !== 1) continue;
         list = grid.queryPoint(point2).filter((item) => item.userData?.isParallelTo(line));
@@ -19487,7 +19488,7 @@ function doubleWallAlignment(lines) {
       point2.copy(newPoint);
       return [];
     };
-    const newLines = expLines.flatMap((line, j) => {
+    const newLines = expLines.flatMap((line) => {
       const normal = line.normal(), id = LineGroupType.getIdByType(line, "doubleWall");
       let step = normal.multiplyScalar(offset);
       const newLines2 = [];

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

@@ -8,14 +8,14 @@ import { Dxf } from './Dxf';
 export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & TEventMap> {
     static name: string;
     static readonly PRE_PROCESSOR: {
-        init: typeof import('../utils/lineHandle/DxfPreProcessor/init').init;
-        AxisAlignCorr: typeof import('../utils/lineHandle/DxfPreProcessor/axisAlignCorr').axisAlignCorr;
+        init: typeof import('../utils/tools/DxfPreProcessor/init').init;
+        AxisAlignCorr: typeof import('../utils/tools/DxfPreProcessor/axisAlignCorr').axisAlignCorr;
         DoorFind: (lines: import('../..').LineSegment[]) => import('../..').LineSegment<Record<string, any>>[];
-        BoundExt: typeof import('../utils/lineHandle/DxfPreProcessor/boundExt').boundExt;
-        DoubleWallAlignment: typeof import('../utils/lineHandle/DxfPreProcessor/doubleWallAlignment').doubleWallAlignment;
-        WallHeightHandle: typeof import('../utils/lineHandle/DxfPreProcessor/wallHeightHandle').wallHeightHandle;
-        DoorSpaceHandle: typeof import('../utils/lineHandle/DxfPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        RemoveShortDoubleWall: typeof import('../utils/lineHandle/DxfPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
+        BoundExt: typeof import('../utils/tools/DxfPreProcessor/boundExt').boundExt;
+        DoubleWallAlignment: typeof import('../utils/tools/DxfPreProcessor/doubleWallAlignment').doubleWallAlignment;
+        WallHeightHandle: typeof import('../utils/tools/DxfPreProcessor/wallHeightHandle').wallHeightHandle;
+        DoorSpaceHandle: typeof import('../utils/tools/DxfPreProcessor/doorSpaceHandle').doorSpaceHandle;
+        RemoveShortDoubleWall: typeof import('../utils/tools/DxfPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     rotateCorrCad?: CAD;
     angle: number;

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

@@ -22,14 +22,14 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
 } & TEventMap> {
     static name: string;
     static readonly PRE_PROCESSOR: {
-        init: typeof import('../utils/lineHandle/DxfPreProcessor/init').init;
-        AxisAlignCorr: typeof import('../utils/lineHandle/DxfPreProcessor/axisAlignCorr').axisAlignCorr;
+        init: typeof import('../utils/tools/DxfPreProcessor/init').init;
+        AxisAlignCorr: typeof import('../utils/tools/DxfPreProcessor/axisAlignCorr').axisAlignCorr;
         DoorFind: (lines: LineSegment[]) => LineSegment<Record<string, any>>[];
-        BoundExt: typeof import('../utils/lineHandle/DxfPreProcessor/boundExt').boundExt;
-        DoubleWallAlignment: typeof import('../utils/lineHandle/DxfPreProcessor/doubleWallAlignment').doubleWallAlignment;
-        WallHeightHandle: typeof import('../utils/lineHandle/DxfPreProcessor/wallHeightHandle').wallHeightHandle;
-        DoorSpaceHandle: typeof import('../utils/lineHandle/DxfPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        RemoveShortDoubleWall: typeof import('../utils/lineHandle/DxfPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
+        BoundExt: typeof import('../utils/tools/DxfPreProcessor/boundExt').boundExt;
+        DoubleWallAlignment: typeof import('../utils/tools/DxfPreProcessor/doubleWallAlignment').doubleWallAlignment;
+        WallHeightHandle: typeof import('../utils/tools/DxfPreProcessor/wallHeightHandle').wallHeightHandle;
+        DoorSpaceHandle: typeof import('../utils/tools/DxfPreProcessor/doorSpaceHandle').doorSpaceHandle;
+        RemoveShortDoubleWall: typeof import('../utils/tools/DxfPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     width: number;
     originalData: OriginalDataItem[];

package/src/utils/DxfSystem/utils/{lineHandle → tools}/DxfPreProcessor/axisAlignCorr/removeQuad.d.ts

@@ -3,4 +3,4 @@ import { LineSegment } from '../../../../../algorithmsStructures/LineSegment';
  * @param lineSegments
  * @returns
  */
-export declare function removeQuad(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];
+export declare function removeQuad(lineSegments: LineSegment[], findMinWidth?: number, _?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/algorithmsStructures/AlignToParallelSegments.d.ts

@@ -0,0 +1,8 @@
+import { LineSegment } from './LineSegment';
+export declare class AlignToParallelSegments {
+    /** 对齐到平行线段, 请在垂直纠正（AxisAlignCorr）后使用
+     * @param lines
+     * @returns
+     */
+    static align(lines: LineSegment[]): LineSegment<Record<string, any>>[];
+}

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

@@ -1,11 +1,12 @@
 import { LineSegment } from './LineSegment';
 import { Point } from './Point';
 export declare class AxisAlignCorr {
-    static start(lines: LineSegment[], targettLine: LineSegment): LineSegment<any>[];
+    static start(lines: LineSegment[], targettLine: LineSegment, excludeLines?: LineSegment[]): LineSegment<any>[];
     private lines;
     private baseline;
+    private excludeLines;
     private grid;
-    constructor(lines: LineSegment[], baseline: LineSegment);
+    constructor(lines: LineSegment[], baseline: LineSegment, excludeLines?: LineSegment[]);
     private visited;
     private newLines;
     private start;