build-dxf 0.1.90 → 0.1.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -1753,6 +1753,9 @@ class PointVirtualGrid {
     point2.currentData[this.id].id = id;
     return true;
   }
+  updates(point2) {
+    point2.forEach((p2) => this.update(p2));
+  }
   /**
    * 获取通过坐标，获取唯一网格索引
    * @param point 
@@ -2613,6 +2616,8 @@ function mergeLineUserData(newLine, line2) {
     line2 = [...line2].sort((a2, b4) => a2.length(true) - b4.length(true));
     return line2.forEach((l) => mergeLineUserData(newLine, l));
   }
+  if (line2.userData.isPassageEntrance === false) delete line2.userData.isPassageEntrance;
+  if (newLine.userData.isPassageEntrance === false) delete newLine.userData.isPassageEntrance;
   const { drawWindow, passageEntrance, ...opt } = line2.userData;
   Object.keys(opt).forEach((key) => {
     if (opt[key] === void 0) delete opt[key];
@@ -6327,7 +6332,12 @@ function clippingInsertObjectDoubleWall(lines) {
         const startResult = startResults[0], endResult = endResults[0];
         if (startResult.targetLine !== endResult.targetLine) {
           const pl1 = startResult.targetLine.projectLineSegment(wioLine), pl2 = endResult.targetLine.projectLineSegment(wioLine), finalPl = pl1.length() > pl2.length() ? pl1 : pl2;
-          polygons.push(new Polygon([wioLine.start, finalPl.start, finalPl.end, wioLine.end]));
+          polygons.push(new Polygon([
+            wioLine.projectPoint(finalPl.start, false),
+            finalPl.start,
+            finalPl.end,
+            wioLine.projectPoint(finalPl.end, false)
+          ]));
           return;
         }
         polygons.push(new Polygon([wioLine.start, startResult.intersectPoint, endResult.intersectPoint, wioLine.end]));
@@ -6751,8 +6761,7 @@ function initData(lines) {
 }
 function getPeDoubleDoorCircles(lines, peDoubleDoorLines) {
   let allLines = [...lines, ...peDoubleDoorLines];
-  const notFoundLines = [];
-  const circlesList = [];
+  let notFoundLines = [], circlesList = [];
   for (let i = 0; i < peDoubleDoorLines.length; i++) {
     const line = peDoubleDoorLines[i];
     let { circles } = maxiCircles.miniCircle(allLines, { circleEdges: [line] });
@@ -6798,7 +6807,9 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
   lines_ = lines_.filter((line) => !internalEdgesSet.has(line));
   return lines_;
 }
-const buildDoubleWallGroup = Object.assign(buildDoubleWallGroup_, {
+const buildDoubleWallGroup = Object.assign((lines_, clearInternalLine) => {
+  return buildDoubleWallGroup_(lines_, clearInternalLine);
+}, {
   setTrajectory(trajectory_) {
     if (trajectory_) trajectory = Object.values(trajectory_);
     else trajectory = void 0;
@@ -6945,7 +6956,7 @@ class DoubleWallHelper {
   static buildGroup(lineSegments) {
     const otherLines = [];
     lineSegments = lineSegments.filter((line) => {
-      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isWindowWall || line.userData.isBayWindow) {
+      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isBayWindowWin || line.userData.isBayWindow) {
         otherLines.push(line);
         return false;
       }
@@ -6991,6 +7002,9 @@ class WallGroupManager {
       if (fun(group)) return group;
     }
   }
+  findGroupByType(type) {
+    return this.findGroup((group) => group.type === type);
+  }
   /** 查找所有符合条件的组
    * @param fun 
    * @returns 
@@ -7003,9 +7017,19 @@ class WallGroupManager {
     }
     return list;
   }
+  findGroupsByType(type) {
+    if (typeof type === "string") type = [type];
+    const set2 = new Set(type);
+    return this.findGroups((group) => set2.has(group.type));
+  }
   static fromByLines(lineSegments) {
     const wallGroupManager = new WallGroupManager();
     const removeLines = [];
+    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall");
+    doubleWalls.forEach((doubleWall) => {
+      wallGroupManager.add({ type: "doubleWall", lines: doubleWall });
+      removeLines.push(...doubleWall);
+    });
     const bayWindowGroups = LineGroupType.getGroupsByType(lineSegments, "bayWindow");
     bayWindowGroups.forEach((bayWindowGroup) => {
       wallGroupManager.add({
@@ -7018,11 +7042,6 @@ class WallGroupManager {
     const doors = lineSegments.filter((line) => line.userData.isDoor);
     wallGroupManager.add({ type: "door", lines: doors });
     removeLines.push(...doors);
-    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall");
-    doubleWalls.forEach((doubleWall) => {
-      wallGroupManager.add({ type: "doubleWall", lines: doubleWall });
-      removeLines.push(...doubleWall);
-    });
     const set2 = new Set(removeLines), walls = [], windowLines = [], balconyRailingLines = [];
     lineSegments.filter((line) => !set2.has(line)).forEach((line) => {
       if (line.userData.isBayWindow) return;
@@ -8379,10 +8398,9 @@ class DxfDataPlugin extends Pipeline {
    */
   static initData(cad, lines) {
     const wallGroupManager = WallGroupManager.fromByLines(lines);
-    const doubleWallGroups = wallGroupManager.findGroups((group) => group.type === "doubleWall"), balconyRailingGroups = wallGroupManager.findGroups((group) => group.type === "balconyRailing"), doorGroups = wallGroupManager.findGroups((group) => group.type === "door"), jointGroups = wallGroupManager.findGroups((group) => group.type === "wall" || group.type === "bayWindow" || group.type === "window"), doubleWalls = doubleWallGroups.map((group) => group.lines), jointLines = jointGroups.map((group) => group.lines).flat(2), { bayWindowLines, wallLines } = jointLines.reduce((opt, line) => (line.userData.isBayWindow ? opt.bayWindowLines.push(line) : opt.wallLines.push(line), opt), { bayWindowLines: [], wallLines: [] }), doorLines = doorGroups.map((group) => group.lines).flat(2), balconyRailingLines = balconyRailingGroups.map((group) => group.lines).flat(2), doubleWallsQuat = doubleWallGroups.map((group) => group.lines).flatMap((lines2) => clippingInsertObjectDoubleWall(lines2)), {
+    const doubleWallGroups = wallGroupManager.findGroupsByType("doubleWall"), balconyRailingGroups = wallGroupManager.findGroupsByType("balconyRailing"), doorGroups = wallGroupManager.findGroupsByType("door"), jointGroups = wallGroupManager.findGroupsByType(["wall", "bayWindow", "window"]), doubleWalls = doubleWallGroups.map((group) => group.lines), jointLines = jointGroups.map((group) => group.lines).flat(2), { bayWindowLines, wallLines } = jointLines.reduce((opt, line) => (line.userData.isBayWindow ? opt.bayWindowLines.push(line) : opt.wallLines.push(line), opt), { bayWindowLines: [], wallLines: [] }), doorLines = doorGroups.map((group) => group.lines).flat(2), balconyRailingLines = balconyRailingGroups.map((group) => group.lines).flat(2), doubleWallsQuat = doubleWallGroups.map((group) => group.lines).flatMap((lines2) => clippingInsertObjectDoubleWall(lines2)), {
       window: windowLines,
       door,
-      passageEntrance,
       untreatedDoubleWallGroup,
       untreatedWall
     } = WallInsertObjectDrawData.handleHoleDrawData(doubleWallsQuat, wallLines, lines);
@@ -8501,9 +8519,11 @@ class BoundExt {
         grid.update(point2);
       });
       line.translate(wallWidth * 0.5, direction);
+      grid.updates(line.points);
     });
     arrayMap.forEach((list, id) => {
       if (list.length >= 2) {
+        if (list[0].line.isParallelTo(list[1].line, 20)) return;
         const p1 = list[0].line.getIntersection(list[1].line);
         if (p1) {
           list[0].point.copy(p1);
@@ -19201,7 +19221,7 @@ function stepEliminationMerge(target, _, source, oldLine) {
   WallInsertObject.recomputed([target]);
 }
 function linesSmoothing(lines, _) {
-  repetitiveTask(2, () => lines = stepElimination(lines, 0.15, stepEliminationMerge));
+  repetitiveTask(2, () => lines = stepElimination(lines, 0.1, stepEliminationMerge));
   WallInsertObject.recomputed(lines);
   return lines;
 }
@@ -19232,6 +19252,16 @@ function shortDistanceLink(lines, radius = 0.1) {
   }
   return [...lines, ...appendLines];
 }
+function linkByWindow(lines, radius = 0.1) {
+  const dpSet = findDiscretePoint(lines.filter((line) => !line.userData.isDoor)), pointVirtualGrid = createPointVirtualGrid(lines.filter((line) => line.userData.isBayWindow));
+  for (const [point2, line] of dpSet) {
+    if (line.userData.isDoor) continue;
+    const list = pointVirtualGrid.queryCircle(point2, radius, true).sort((a2, b4) => a2.point.distance(point2) - b4.point.distance(point2));
+    if (list.length === 0) continue;
+    point2.copy(list[0].point);
+  }
+  return lines;
+}
 function preprocessing(lines) {
   const pointVirtualGrid = new PointVirtualGrid(), quadtree = new Quadtree(Box2.fromByLineSegment(...lines)), doors = [];
   lines.forEach((line) => {
@@ -19250,6 +19280,7 @@ function preprocessing(lines) {
     else door.userData.endIntersection = quadtree.queryPoint(door.end)[0]?.line;
   });
   lines = shortDistanceLink(lines, 0.4);
+  lines = linkByWindow(lines, 0.05);
   pointVirtualGrid.clear();
   quadtree.clear();
   return lines;
@@ -19304,8 +19335,9 @@ function correction(lines, targettLine, option) {
   lines = AxisAlignCorr.start(lines, targettLine);
   lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
-  lines = removeDangline(lines, 0.15, true);
+  lines = removeDangline(lines, 0.1, false);
   lines = linesSmoothing(lines);
+  lines = linkByWindow(lines, 0.05);
   let newLines = lines.filter((line) => !line.userData.isDoor);
   let doorLines = lines.filter((line) => line.userData.isDoor);
   newLines = buildBayWindowGroup(newLines, false);
@@ -19328,7 +19360,7 @@ function axisAlignCorr(lines, option, verticalReferenceLine) {
     lines.forEach((line) => {
       const id = LineGroupType.getIdByType(line, "bayWindow");
       if (id && line.userData.isWindow) {
-        line.userData.isWindowWall = true;
+        line.userData.isBayWindowWin = true;
       }
     });
     const lineSegments = correction(lines, verticalReferenceLine, option);
@@ -19520,9 +19552,6 @@ const PRE_PROCESSOR = {
   /** 处理门线垂直方向有其他线段遮挡的情况
    */
   DoorSpaceHandle: doorSpaceHandle,
-  /** 线段平滑处理
-   */
-  LinesSmoothing: linesSmoothing,
   /** 移除与双线墙链接的短线段
    */
   RemoveShortDoubleWall: removeShortDoubleWall

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

@@ -15,7 +15,6 @@ export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & T
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/axisAlignCorr/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     rotateCorrCad?: CAD;

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

@@ -29,7 +29,6 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/axisAlignCorr/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     width: number;

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

@@ -41,6 +41,7 @@ export type WallLineGlobalOption = {
     isBayWindow?: boolean;
     /** 是不是飘窗墙壁 */
     isWindowWall?: boolean;
+    isBayWindowWin?: boolean;
     /** 是不是阳台护栏 */
     isBalconyRailing?: boolean;
     /** 是不是门线 */

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

@@ -6,7 +6,6 @@ import { doubleWallAlignment } from './doubleWallAlignment';
 import { wallHeightHandle } from './wallHeightHandle';
 import { doorSpaceHandle } from './doorSpaceHandle';
 import { removeShortDoubleWall } from './removeShortDoubleWall';
-import { linesSmoothing } from './axisAlignCorr/linesSmoothing';
 /**
  * 默认提供的预处理函数
  */
@@ -28,9 +27,6 @@ export declare const PRE_PROCESSOR: {
     /** 处理门线垂直方向有其他线段遮挡的情况
      */
     DoorSpaceHandle: typeof doorSpaceHandle;
-    /** 线段平滑处理
-     */
-    LinesSmoothing: typeof linesSmoothing;
     /** 移除与双线墙链接的短线段
      */
     RemoveShortDoubleWall: typeof removeShortDoubleWall;

package/src/utils/DxfSystem/utils/lineHandle/buildGroup/buildDoubleWallGroup.d.ts

@@ -7,6 +7,6 @@ import { LineUserData } from '../../../type';
  */
 export declare function buildDoubleWallGroup_(lines_: LineSegment<LineUserData>[], clearInternalLine?: boolean): LineSegment<LineUserData>[];
 /** */
-export declare const buildDoubleWallGroup: typeof buildDoubleWallGroup_ & {
+export declare const buildDoubleWallGroup: ((lines_: LineSegment<LineUserData>[], clearInternalLine?: boolean) => LineSegment<LineUserData>[]) & {
     setTrajectory(trajectory_: Record<string, any> | undefined): void;
 };

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

@@ -16,10 +16,12 @@ export declare class WallGroupManager {
      * @returns
      */
     findGroup(fun: (group: IGroup) => boolean): IGroup<any> | undefined;
+    findGroupByType(type: string): IGroup<any> | undefined;
     /** 查找所有符合条件的组
      * @param fun
      * @returns
      */
     findGroups(fun: (group: IGroup) => boolean): IGroup<any>[];
+    findGroupsByType(type: string | string[]): IGroup<any>[];
     static fromByLines(lineSegments: LineSegment[]): WallGroupManager;
 }

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

@@ -40,6 +40,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      */
     removes(point: Point[]): this;
     update(point: Point): boolean;
+    updates(point: Point[]): void;
     /**
      * 获取通过坐标，获取唯一网格索引
      * @param point