build-dxf 0.1.87 → 0.1.88

package/package.json

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

package/src/build.js

@@ -377,7 +377,7 @@ class PointVirtualGrid {
    * 查找相同点
    * @param point 
    */
-  queryPoint(point2, excludeOneself = false) {
+  queryPoint(point2, excludeOneself = false, eps = 1e-9) {
     const list = new PvgList();
     let set2;
     if (point2.currentData[this.id]) {
@@ -387,7 +387,7 @@ class PointVirtualGrid {
       if (this.map.has(id)) set2 = this.map.get(id);
     }
     set2?.forEach((item) => {
-      if (point2.equal(item.point)) {
+      if (point2.equal(item.point, eps)) {
         if (excludeOneself && point2 === item.point) return;
         list.push(item);
       }
@@ -1706,13 +1706,20 @@ class LineSegment {
     return (px * dx + py * dy) / len2;
   }
   /** 获取两条线段夹角
-   * @deprecated 已废弃
+   * @deprecated 已废弃, 请使用 angle
    * @param line 
    */
   includedAngle(line) {
     const d1 = this.direction(), d2 = line.direction();
     return d1.angleBetween(d2) / (Math.PI / 180);
   }
+  /** 获取两条线段夹角
+   * @param line 
+   */
+  angle(line, opt) {
+    const d1 = this.direction(), d2 = line.direction();
+    return d1.angle(d2, opt);
+  }
   /**
    * 判断两条线段，是否在同一直线上：
    *  - 返回 -1：不在同一直线（不共线）
@@ -2332,7 +2339,7 @@ class Point {
    * @param point 
    * @returns 
    */
-  equal(point2) {
+  equal(point2, eps = 1e-9) {
     return Math.abs(point2.x - this.x) < 1e-9 && Math.abs(point2.y - this.y) < 1e-9;
   }
   /**
@@ -2594,8 +2601,8 @@ class Point {
     }
     return num;
   }
-  hashCode(fixed = 4) {
-    return `${this.x.toFixed(fixed)},${this.y.toFixed(6)}`;
+  hashCode(fixed = 6) {
+    return `${this.x.toFixed(fixed)},${this.y.toFixed(fixed)}`;
   }
   /**
    * 克隆
@@ -2641,7 +2648,7 @@ class Point {
    * @param tolerance 
    * @returns 
    */
-  static adsorb(points, tolerance = 15e-5, mode = "average") {
+  static adsorb(points, tolerance = 1e-3, mode = "average") {
     const grid = new PointVirtualGrid();
     points.forEach((p2) => grid.insert(p2));
     const visited = /* @__PURE__ */ new Set();
@@ -2662,7 +2669,6 @@ class Point {
       results.forEach((p2) => {
         p2.set(x, y);
         visited.add(p2);
-        grid.update(p2);
         grid.remove(p2);
       });
     }
@@ -3473,6 +3479,18 @@ class UndirectedGraph {
       callbackFun(node, neighbors);
     }
   }
+  /** 遍历边
+   * @param callbackFun 
+   */
+  forEachEdge(callbackFun) {
+    for (const [node, neighbors] of this.adjacencyList.entries()) {
+      for (const neighbor of neighbors) {
+        if (neighbor > node) {
+          callbackFun(node, neighbor);
+        }
+      }
+    }
+  }
 }
 class LineSegmentUndirectedGraph extends UndirectedGraph {
   // 线段存储：使用规范化 key (小索引-大索引) 避免双向存储
@@ -3630,7 +3648,7 @@ class LineSegmentUndirectedGraph extends UndirectedGraph {
    * @returns 
    */
   static breakpointMerging(lines, callBack, removeLines = /* @__PURE__ */ new Set(), newLines = []) {
-    Point.adsorb(lines.flatMap((line) => line.points));
+    Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
     const lud = new LineSegmentUndirectedGraph(lines);
     lud.breakpointMerging(callBack, removeLines, newLines);
     lines = lud.getLineAll();
@@ -5915,7 +5933,7 @@ function migration(newLine, oldLine) {
     }) ?? [];
   });
 }
-function lineSegmentClipping(lines, minLen = 0.03, dedup = true) {
+function lineSegmentClipping(lines, minLen = 1e-9, dedup = true) {
   const quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
   lines.forEach((line) => quadtree.insert({ line, userData: void 0 }));
   let newLines = lines.flatMap((line) => {
@@ -5952,34 +5970,30 @@ var Side = /* @__PURE__ */ ((Side2) => {
 })(Side || {});
 class MiniCircles {
   debug = {
-    angle: false
+    angle: false,
+    edges: false
   };
+  scope = 1e-3;
   /** 通过并查集，查找为环的一部分边
    * @description 
    * @param lines 
    */
   findCycleEntryEdges(lineUG_) {
     if (!(lineUG_ instanceof LineSegmentUndirectedGraph)) {
-      if (Array.isArray(lineUG_)) lineUG_ = new LineSegmentUndirectedGraph(lineUG_);
-      else throw new Error("参数错误，非线段数组或者线段无向图对象");
-    }
-    const unionFindSet = new UnionFindSet(lineUG_.size), visited = /* @__PURE__ */ new Set(), ringEdges = [], lineUG = lineUG_;
-    function find(n1) {
-      visited.add(n1);
-      const neighbors = lineUG.getNeighbors(n1);
-      neighbors?.forEach((n2) => {
-        if (visited.has(n2)) return;
-        if (unionFindSet.find(n1) === unionFindSet.find(n2)) {
-          const line = lineUG.getLine(n1, n2);
-          ringEdges.push(line);
-        } else {
-          unionFindSet.union(n1, n2);
-        }
-      });
+      if (Array.isArray(lineUG_)) {
+        lineUG_ = new LineSegmentUndirectedGraph(lineUG_);
+      } else {
+        throw new Error("参数错误");
+      }
     }
-    lineUG.forEach((n1) => {
-      if (visited.has(n1)) return;
-      find(n1);
+    const lineUG = lineUG_, unionFind = new UnionFindSet(lineUG.size), ringEdges = [];
+    lineUG.forEachEdge((n1, n2) => {
+      const line = lineUG.getLine(n1, n2);
+      if (unionFind.find(n1) === unionFind.find(n2)) {
+        ringEdges.push(line);
+      } else {
+        unionFind.union(n1, n2);
+      }
     });
     return ringEdges;
   }
@@ -6024,7 +6038,7 @@ class MiniCircles {
    */
   findSameSidePath(opt) {
     let count = 0;
-    let { A, B, exitPoint, grid, path = /* @__PURE__ */ new Set() } = opt;
+    let { A, B, exitPoint = A, grid, path = /* @__PURE__ */ new Set() } = opt;
     if (Array.isArray(grid)) {
       const lines = grid;
       grid = new PointVirtualGrid();
@@ -6036,7 +6050,7 @@ class MiniCircles {
         return;
       }
       if (exitPoint.equal(B)) return [...path];
-      const candidates = grid.queryPoint(B, true).filter((item) => !path.has(item.userData));
+      const candidates = grid.queryCircle(B, this.scope).filter((item) => item.point !== B).filter((item) => !path.has(item.userData));
       if (candidates.length === 0) return;
       const BA = A.directionFrom(B);
       let minAngle = Infinity;
@@ -6626,7 +6640,7 @@ function initData(lines) {
       doorLines.push(line);
       continue;
     }
-    if (line.userData.isBayWindow) {
+    if (line.userData.isBayWindow || line.userData.isWindow && LineGroupType.hasType(line, "bayWindow")) {
       bayWindowLines.push(line);
       continue;
     }
@@ -6659,11 +6673,11 @@ function getPeDoubleDoorCircles(lines, peDoubleDoorLines) {
   };
 }
 function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
+  Point.adsorb(lines_.flatMap((line) => line.points), 5e-4);
+  lines_ = lines_.filter((line) => line.len > 1e-7);
   const {
     doorLines,
     otherLines,
-    // bayWindowLines,
-    // peDoors,
     peDoubleDoors
   } = initData(lines_);
   const { circlesList } = getPeDoubleDoorCircles(otherLines, peDoubleDoors);
@@ -6689,7 +6703,7 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
   });
   const internalEdgesSet = new Set(internalEdges);
   lines_ = lines_.filter((line) => !internalEdgesSet.has(line));
-  return LineSegmentUndirectedGraph.breakpointMerging(lines_, mergeLineUserData).filter((line) => line.length() > 1e-6);
+  return LineSegmentUndirectedGraph.breakpointMerging(lines_, mergeLineUserData).filter((line) => line.length() > 1e-9);
 }
 const buildDoubleWallGroup = Object.assign(buildDoubleWallGroup_, {
   setTrajectory(trajectory_) {
@@ -6792,7 +6806,7 @@ class DoubleWallHelper {
     }
     resultList.forEach((result) => {
       const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
-      if (project0.includedAngle(project1) > 135) {
+      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
         project1.points = [project1.points[1], project1.points[0]];
       }
       const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
@@ -6828,7 +6842,7 @@ class DoubleWallHelper {
     quadtree.clear();
     lines.push(...otherLines);
     Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
-    return lines.filter((line) => line.length() > 1e-5);
+    return lines.filter((line) => line.length() > 1e-9);
   }
   /**
    * 创建分组
@@ -6836,14 +6850,16 @@ class DoubleWallHelper {
   static buildGroup(lineSegments) {
     const doors = [];
     lineSegments = lineSegments.filter((line) => {
-      if (line.userData.isDoor) {
+      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isBayWindow) {
         doors.push(line);
         return false;
       }
       return true;
     });
+    lineSegments = buildDoubleWallGroup(lineSegments, true);
     lineSegments = this.complementSide(lineSegments);
-    lineSegments = buildDoubleWallGroup([...lineSegments], true);
+    WallInsertObject.recomputed(lineSegments);
+    lineSegments = buildDoubleWallGroup(lineSegments, true);
     return [...lineSegments, ...doors];
   }
 }
@@ -7477,7 +7493,6 @@ class ThreeVJiaJson extends Pipeline {
   }
 }
 function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
-  angle = 0;
   lineSegments = LineSegmentUndirectedGraph.rotate(lineSegments.map((line) => line.clone()), angle, (line, center, angle2) => {
     WallInsertObject.forEachInsertObjectData(line, (data) => {
       data.forEach((item) => {
@@ -8180,7 +8195,7 @@ class DxfDrawPlugin {
           const line = lineSegment.clone();
           const doorThickness = DEFAULT_WALL_WIDTH * 0.2;
           const list = [];
-          setColor("cyan");
+          setColor("yellow");
           if (line.length() < 1.2) {
             line.extendAlongDirection(-doorThickness * 0.5);
             const normal = lineSegment.normal();
@@ -8213,7 +8228,7 @@ class DxfDrawPlugin {
     cad.addDrawHandler({
       type: ["window"],
       handler: ({ group, drawLine, setColor }) => {
-        setColor("yellow");
+        setColor("cyan");
         group.lines.forEach((line) => {
           drawLine(line.start, line.end);
           line.toRectangle(line?.userData?.wallWidth ?? DEFAULT_WALL_WIDTH, "butt").path2D((p1, p2) => drawLine(p1, p2));
@@ -18751,67 +18766,6 @@ function init(lines, option) {
   buildDoubleWallGroup.setTrajectory(option.trajectory);
   return lines;
 }
-class LineQueryer {
-  pointVirtualGrid;
-  quadtree;
-  constructor(lines) {
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
-    this.quadtree = createQuadtree(lines);
-  }
-  update(lines) {
-    this.clear();
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
-    this.quadtree = createQuadtree(lines);
-  }
-  clear() {
-    this.pointVirtualGrid.clear();
-    this.quadtree.clear();
-  }
-  /** 
-   * @param point 
-   * @param radius 
-   * @param opt 
-   * @returns 
-   */
-  queryNearestPoint(point2, opt) {
-    if (!point2) throw new Error("请传入查询点");
-    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
-    const results = this.pointVirtualGrid.queryCircle(point2, radius).filter((item) => item.point !== point2).filter((item) => condition ? condition(item) : true);
-    results.sort((a2, b4) => a2.point.distance(point2, true) - b4.point.distance(point2, true));
-    if (results.length > resultIndex) return {
-      point: results[resultIndex].point,
-      line: results[resultIndex].userData
-    };
-    return null;
-  }
-  /** 
-   * @param point 
-   * @param radius 
-   * @param opt 
-   * @returns 
-   */
-  queryNearestLine(point2, opt) {
-    if (!point2) throw new Error("请传入查询点");
-    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
-    const results = this.quadtree.queryCircle(point2, radius).map((item) => {
-      const projPoint = item.line.projectPoint(point2, false);
-      if (projPoint && (!condition || condition(item, projPoint))) {
-        if (projPoint) return {
-          ...item,
-          distance: projPoint.distance(point2) ?? Infinity,
-          projPoint
-        };
-      }
-      return null;
-    }).filter((i) => !!i);
-    results.sort((a2, b4) => a2.distance - b4.distance);
-    if (results.length > resultIndex) return {
-      point: results[resultIndex].projPoint,
-      line: results[resultIndex].line
-    };
-    return null;
-  }
-}
 function parallel(line, baseline) {
   const currentAngle = Math.atan2(line.end.y - line.start.y, line.end.x - line.start.x);
   const targetAngle = Math.atan2(baseline.end.y - baseline.start.y, baseline.end.x - baseline.start.x);
@@ -18933,6 +18887,67 @@ class AxisAlignCorr {
     this.addVisited(line);
   }
 }
+class LineQueryer {
+  pointVirtualGrid;
+  quadtree;
+  constructor(lines) {
+    this.pointVirtualGrid = createPointVirtualGrid(lines);
+    this.quadtree = createQuadtree(lines);
+  }
+  update(lines) {
+    this.clear();
+    this.pointVirtualGrid = createPointVirtualGrid(lines);
+    this.quadtree = createQuadtree(lines);
+  }
+  clear() {
+    this.pointVirtualGrid.clear();
+    this.quadtree.clear();
+  }
+  /** 
+   * @param point 
+   * @param radius 
+   * @param opt 
+   * @returns 
+   */
+  queryNearestPoint(point2, opt) {
+    if (!point2) throw new Error("请传入查询点");
+    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
+    const results = this.pointVirtualGrid.queryCircle(point2, radius).filter((item) => item.point !== point2).filter((item) => condition ? condition(item) : true);
+    results.sort((a2, b4) => a2.point.distance(point2, true) - b4.point.distance(point2, true));
+    if (results.length > resultIndex) return {
+      point: results[resultIndex].point,
+      line: results[resultIndex].userData
+    };
+    return null;
+  }
+  /** 
+   * @param point 
+   * @param radius 
+   * @param opt 
+   * @returns 
+   */
+  queryNearestLine(point2, opt) {
+    if (!point2) throw new Error("请传入查询点");
+    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
+    const results = this.quadtree.queryCircle(point2, radius).map((item) => {
+      const projPoint = item.line.projectPoint(point2, false);
+      if (projPoint && (!condition || condition(item, projPoint))) {
+        if (projPoint) return {
+          ...item,
+          distance: projPoint.distance(point2) ?? Infinity,
+          projPoint
+        };
+      }
+      return null;
+    }).filter((i) => !!i);
+    results.sort((a2, b4) => a2.distance - b4.distance);
+    if (results.length > resultIndex) return {
+      point: results[resultIndex].projPoint,
+      line: results[resultIndex].line
+    };
+    return null;
+  }
+}
 function shortDistanceLink(lines, radius = 0.1) {
   const dpSet = findDiscretePoint(lines.filter((line) => !line.userData.isDoor)), pointVirtualGrid = createPointVirtualGrid(dpSet.map((v2) => v2)), appendLines = [], visited = /* @__PURE__ */ new Set();
   const getWeight2 = (target, point2, line) => {
@@ -19001,22 +19016,6 @@ function adsorption(lines, option) {
     });
     if (result) return modifyManager.setPoint(line, point2, result.point.clone());
   }
-  function adsorptPoint(point2, line) {
-    const result = lineQueryer.queryNearestPoint(point2, {
-      radius: threshold,
-      condition(node) {
-        const line2 = node.userData;
-        return line2.isPerpendicularTo(line, 15);
-      }
-    });
-    if (result) {
-      const propPoint = result.line.projectPoint(point2, false);
-      if (propPoint) {
-        modifyManager.setPoint(line, point2, propPoint);
-        modifyManager.setPoint(result.line, result.point, propPoint);
-      }
-    }
-  }
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     line.points.map((point2) => {
@@ -19025,25 +19024,13 @@ function adsorption(lines, option) {
     });
   }
   modifyManager.modify();
-  lines = lines.filter((line) => line.length() > 1e-9);
-  const dpls = [...findDiscretePointLine2(lines)];
-  lineQueryer.update(lines);
-  for (let i = 0; i < dpls.length; i++) {
-    const line = dpls[i];
-    line.points.map((point2) => {
-      let results = lineQueryer.pointVirtualGrid.queryPoint(point2, true);
-      if (results.length === 0 && lineQueryer.quadtree.queryCircle(point2, 1e-4).length < 2) {
-        adsorptPoint(point2, line);
-      }
-    });
-  }
-  modifyManager.modify();
   lineQueryer.clear();
-  Point.adsorb(lines.flatMap((line) => line.points), 1e-4, "first");
+  Point.adsorb(lines.flatMap((line) => line.points), 1e-3);
   return lines;
 }
 function removeShortLine(lines, len = 0.01) {
   let defaultLines = [], doorLines = [];
+  Point.adsorb(lines.flatMap((line) => line.points), 1e-3);
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     if (line.userData.isDoor) doorLines.push(line);
@@ -19091,17 +19078,14 @@ function correction(lines, targettLine, option) {
   newLines = buildBayWindowGroup(newLines, false);
   const { wallGroup = true } = option ?? {};
   if (wallGroup) {
-    newLines = DoubleWallHelper.complementSide(newLines);
-    WallInsertObject.recomputed(newLines);
-    newLines = buildDoubleWallGroup(newLines, true);
+    newLines = DoubleWallHelper.buildGroup(newLines);
     newLines = buildBayWindowGroup(newLines, false);
   }
-  new WallInsertObject(lines).recomputed().merge();
+  new WallInsertObject(newLines).recomputed().merge();
   newLines.push(...doorLines);
-  Point.adsorb(newLines.flatMap((line) => line.points), 1e-4);
-  lines = removeShortLine(lines, 0.05);
-  lines = breakpointMerging(lines);
-  return newLines;
+  newLines = removeShortLine(newLines, 0.05);
+  newLines = breakpointMerging(newLines);
+  return newLines.filter((line) => line.len > 7e-9);
 }
 function axisAlignCorr(lines, option, verticalReferenceLine) {
   verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines.filter((line) => !line.userData.isDoor));
@@ -19288,7 +19272,7 @@ function getNextPoint(point2, line, next, width) {
 function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
   const grid = createPointVirtualGrid(lineSegments);
   function getIntersInfo(line, point2) {
-    const intersList = grid.queryPoint(point2, true);
+    const intersList = grid.queryCircle(point2, 1e-4).filter((item) => item.point !== point2);
     if (intersList.length == 0) return;
     let firstLine = null, firstPoint = null;
     let count = 0;
@@ -19306,7 +19290,7 @@ function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
     if (count !== 1) return;
     if (!firstLine || !firstPoint) return;
     const firstOtherPoint = firstLine.getAnotherPoint(firstPoint);
-    const nextResult = grid.queryPoint(firstOtherPoint, true);
+    const nextResult = grid.queryCircle(firstOtherPoint, 1e-4).filter((item) => item.point !== firstOtherPoint);
     return {
       length: firstLine.length(),
       firstLine,
@@ -19318,17 +19302,18 @@ function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
       parallel: parallel2
     };
   }
-  const removeLines = [];
+  const removeLinesSet = /* @__PURE__ */ new Set();
   for (let i = 0; i < lineSegments.length; i++) {
     const line = lineSegments[i];
+    if (removeLinesSet.has(line)) continue;
     const len = line.length();
     if (len > findMinWidth) continue;
     const startInfo = getIntersInfo(line, line.start);
     if (!startInfo) continue;
     const endInfo = getIntersInfo(line, line.end);
     if (!endInfo) continue;
-    const angle = startInfo.direction.angleBetween(endInfo.direction);
-    if (angle < 1e-5) continue;
+    const angle = startInfo.direction.angle(endInfo.direction, { unit: "degree", range: "180" });
+    if (angle < 177) continue;
     if (!startInfo.nextOnlyVertical && !endInfo.nextOnlyVertical) continue;
     let mainInfo = startInfo, secondaryInfo = endInfo;
     if (startInfo.nextOnlyVertical && endInfo.nextOnlyVertical) {
@@ -19343,13 +19328,13 @@ function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
     const parallel2 = startInfo.parallel.concat(endInfo.parallel);
     const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
     if (!newPoint) continue;
-    removeLines.push(line);
+    removeLinesSet.add(line);
     line.points.forEach((p2) => grid.remove(p2));
     if (parallel2.length === 0) {
       const oldLine = mainInfo.firstLine.clone();
       mainInfo.firstPoint.copy(newPoint);
       secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
-      removeLines.push(secondaryInfo.firstLine);
+      removeLinesSet.add(secondaryInfo.firstLine);
       secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
       mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
       if (typeof onMerge === "function") onMerge(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
@@ -19363,7 +19348,6 @@ function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
       startInfo.parallel.concat(endInfo.parallel).forEach((item) => grid.update(item.point));
     }
   }
-  const removeLinesSet = new Set(removeLines);
   lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
   return lineSegments;
 }
@@ -19647,7 +19631,6 @@ class CorrectionDxf extends Dxf {
   onAddFromParent(parent) {
     parent.Dxf.addEventListener("cadChange", (e) => {
       e.options.trajectory && this.addPreProcessor(PRE_PROCESSOR.BoundExt);
-      this.addPreProcessor(PRE_PROCESSOR.DoubleWallAlignment);
       const lines = parent.Dxf.getLineSegments(true);
       this.set(lineDataToOriginalData(lines, parent.Dxf.originalZAverage), {
         trajectory: e.options.trajectory,

package/src/index.css

@@ -387,10 +387,6 @@
   height: 20px;
 }
 
-.h-\[100\%\] {
-  height: 100%;
-}
-
 .h-\[100vh\] {
   height: 100vh;
 }
@@ -399,6 +395,10 @@
   height: 100%;
 }
 
+.h-screen {
+  height: 100vh;
+}
+
 .max-h-\[300px\] {
   max-height: 300px;
 }
@@ -427,6 +427,10 @@
   width: 100%;
 }
 
+.w-screen {
+  width: 100vw;
+}
+
 .max-w-\[150px\] {
   max-width: 150px;
 }

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

@@ -1,8 +1,5 @@
 import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
 import { SetDataOption, LineUserData } from '../../../type';
-/**
- * 门的障碍物清理
- */
 /**
  * 轴对齐垂直修正
  * @param lines 待调整线段组

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

@@ -169,10 +169,17 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     projectPointValue(point: Point, eps?: number): number;
     /** 获取两条线段夹角
-     * @deprecated 已废弃
+     * @deprecated 已废弃, 请使用 angle
      * @param line
      */
     includedAngle(line: LineSegment): number;
+    /** 获取两条线段夹角
+     * @param line
+     */
+    angle(line: LineSegment, opt?: {
+        unit?: "radian" | "degree" | "cos";
+        range?: "180" | "360";
+    }): number;
     /**
      * 判断两条线段，是否在同一直线上：
      *  - 返回 -1：不在同一直线（不共线）

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

@@ -15,7 +15,9 @@ export interface MiniCirclesOption {
 export declare class MiniCircles {
     debug: {
         angle: boolean;
+        edges: boolean;
     };
+    scope: number;
     /** 通过并查集，查找为环的一部分边
      * @description
      * @param lines
@@ -38,7 +40,7 @@ export declare class MiniCircles {
     findSameSidePath(opt: {
         A: Point;
         B: Point;
-        exitPoint: Point;
+        exitPoint?: Point;
         grid: PointVirtualGrid<LineSegment> | LineSegment[];
         path?: Set<LineSegment>;
     }): LineSegment<Record<string, any>>[] | undefined;

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

@@ -22,7 +22,7 @@ export declare class Point<T = Record<string, any>> {
      * @param point
      * @returns
      */
-    equal(point: Point): boolean;
+    equal(point: Point, eps?: number): boolean;
     /**
      *
      * @param arr

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

@@ -81,7 +81,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * 查找相同点
      * @param point
      */
-    queryPoint(point: Point, excludeOneself?: boolean): PvgList<T>;
+    queryPoint(point: Point, excludeOneself?: boolean, eps?: number): PvgList<T>;
     /** 获取多边形内的点
      * @param polygon
      */

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

@@ -18,6 +18,10 @@ export declare class UndirectedGraph {
      * @param callbackFun
      */
     forEach(callbackFun: (node: number, neighbors: Set<number>) => void): void;
+    /** 遍历边
+     * @param callbackFun
+     */
+    forEachEdge(callbackFun: (u: number, v: number) => void): void;
 }
 /**
  * 线段无向图