build-dxf 0.1.149 → 0.1.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.149",
+  "version": "0.1.150",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -9110,11 +9110,18 @@ class WallHole {
    * @param source 
    */
   static splitHole(target, source) {
-    if (!Array.isArray(source)) source = [];
-    this.filterIllegal(target);
+    if (!Array.isArray(source)) source = [source];
+    if (target instanceof LineSegment) {
+      this.filterIllegal(target);
+      const iterator = this.getIterator(target);
+      this.splitHole([...iterator], source);
+      this.clear(target);
+      return;
+    } else if (!Array.isArray(target)) {
+      throw new Error("传入参数非孔洞数组或线段");
+    }
     source = source.filter((line) => line.length > 1e-9);
-    const iterator = this.getIterator(target);
-    for (const hole of iterator) {
+    for (const hole of target) {
       let find = false, min = Infinity, maxLine = null;
       for (let i = 0; i < source.length; i++) {
         const line = source[i];
@@ -9139,7 +9146,6 @@ class WallHole {
         this.addHole(maxLine, hole);
       }
     }
-    this.clear(target);
   }
 }
 const WH = WallHole;
@@ -11037,6 +11043,8 @@ function mergeLineUserData(newLine, line2) {
     return line2.forEach((l) => mergeLineUserData(newLine, l));
   }
   WallHole.cancelPairing(newLine, line2);
+  if (line2.userData.isDoor === false) delete line2.userData.isDoor;
+  if (line2.userData.isWindow === false) delete line2.userData.isWindow;
   if (line2.userData.isBayWindow === false) delete line2.userData.isBayWindow;
   if (line2.userData.isPassageEntrance === false) delete line2.userData.isPassageEntrance;
   if (newLine.userData.isPassageEntrance === false) delete newLine.userData.isPassageEntrance;
@@ -11962,6 +11970,7 @@ class AlignToParallelSegments {
       }
       const intersectPoints = intersectList.filter((item) => item.userData.length > 1e-5).map((item) => item.point);
       layoutDesign(group2, axisLine, intersectPoints, opt);
+      opt.onLayoutDesign?.(group2, DELETE_SYMBOL);
     }
     return groups.flat().filter((line) => {
       if (line.length < 1e-9) return false;
@@ -12130,8 +12139,9 @@ function correction(lines, targettLine, option) {
   lines = AxisAlignCorr.start(lines, targettLine);
   const bayWindow = lines.filter((line) => line.userData.isBayWindow).map((line) => line.center);
   lines = splitIntersectedLine(lines, 1e-9);
+  WallHole.filterIllegal(lines).merge(lines);
   lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => line.userData.isBalconyRailing ? "balconyRailing" : "lines")).handle("lines", (lines2) => {
-    return AlignToParallelSegments.align(lines2, {
+    lines2 = AlignToParallelSegments.align(lines2, {
       onMergeLine: mergeLineUserData,
       onGroup(group2, projValues, axis) {
         if (group2.length <= 1) return;
@@ -12141,9 +12151,18 @@ function correction(lines, targettLine, option) {
           line.userData.wallWidth = dist;
         });
       },
-      onSegmentClippedAway: WallHole.splitHole.bind(WallHole)
-      // esp: 0.4
+      onLayoutDesign(lines3, delKey) {
+        const holes = [];
+        lines3 = lines3.filter((line) => {
+          holes.push(...WallHole.getIterator(line));
+          WallHole.clear(line);
+          return !line.currentData[delKey];
+        });
+        WallHole.splitHole(holes, lines3);
+      }
+      // onSegmentClippedAway: WallHole.splitHole.bind(WallHole)
     });
+    return lines2;
   }).handle("balconyRailing", (lines2) => AlignToParallelSegments.align(lines2)).merge();
   WallHole.merge(lines);
   lines = adsorption(lines, option);

package/src/dxf-system/utils/WallHole.d.ts

@@ -129,6 +129,6 @@ export declare class WallHole {
      * @param target
      * @param source
      */
-    static splitHole(target: LineSegment<LineUserData>, source: LineSegment<LineUserData> | LineSegment<LineUserData>[]): void;
+    static splitHole(target: LineSegment<LineUserData> | HoleData[], source: LineSegment<LineUserData> | LineSegment<LineUserData>[]): void;
 }
 export declare const WH: typeof WallHole;

package/src/index3.js

@@ -18163,7 +18163,7 @@ class DefaultCommand extends Command {
     });
     for await (const line2 of lineSelector) {
       if (!line2) return;
-      if (line2.userData.insertObject) {
+      if (line2.currentData.insertObject) {
         this.setSelectHoleLine(line2);
       } else {
         if (eventInput.isKeyDown("alt")) return this.removeSelectLine(line2);

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

@@ -6,6 +6,7 @@ export interface AlignDescriptor {
     onMergeLine?: (target: LineSegment, source: LineSegment) => void;
     onGroup?: OnGroupFun;
     onSegmentClippedAway?: (target: LineSegment, clipLines: LineSegment[]) => void;
+    onLayoutDesign?: (lines: LineSegment[], DELETE_SYMBOL: symbol) => void;
 }
 /** 通过平行轴和垂直轴分组对齐线段，搭配垂直纠正使用
  */