build-dxf 0.1.109 → 0.1.111

package/package.json

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

package/src/build.js

@@ -399,9 +399,9 @@ class LineSegment {
   currentData = {};
   // line: any
   uuid = uuid();
-  #length = 0;
+  _length = 0;
   get len() {
-    return this.#length;
+    return this._length;
   }
   get start() {
     return this.points[0];
@@ -409,11 +409,11 @@ class LineSegment {
   get end() {
     return this.points[1];
   }
-  #center = Point.zero();
+  _center = Point.zero();
   get center() {
-    return this.#center.clone();
+    return this._center.clone();
   }
-  #direction = Point.zero();
+  _direction = Point.zero();
   constructor(p1, p2) {
     this.set(p1 ?? this.start, p2 ?? this.end);
     this.start.currentData[LineSegment.LINE_SYMBOL] = this;
@@ -422,12 +422,12 @@ class LineSegment {
   }
   _initLenListener() {
     const distanceUpdate = () => {
-      this.#length = this.points[0].distance(this.points[1]);
-      this.#center.set(
+      this._length = this.points[0].distance(this.points[1]);
+      this._center.set(
         this.points[0].x + (this.points[1].x - this.points[0].x) * 0.5,
         this.points[0].y + (this.points[1].y - this.points[0].y) * 0.5
       );
-      this.#direction = this.points[1].directionFrom(this.points[0]);
+      this._direction = this.points[1].directionFrom(this.points[0]);
     };
     this.points.forEach((p2) => fields.forEach((k) => {
       let value = p2[k];
@@ -455,12 +455,12 @@ class LineSegment {
     const dx = direct.x * half;
     const dy = direct.y * half;
     this.start.set(
-      this.#center.x - dx,
-      this.#center.y - dy
+      this._center.x - dx,
+      this._center.y - dy
     );
     this.end.set(
-      this.#center.x + dx,
-      this.#center.y + dy
+      this._center.x + dx,
+      this._center.y + dy
     );
     return this;
   }
@@ -477,7 +477,7 @@ class LineSegment {
    * @returns 
    */
   length(_ = false) {
-    return this.#length;
+    return this._length;
   }
   /** 开始点向线段内收缩 width
    * @param width 
@@ -500,35 +500,35 @@ class LineSegment {
    * @param line 
    * @returns 
    */
-  isSameEndpoint(line) {
-    return this.start.equal(line.start) || this.start.equal(line.end) || this.end.equal(line.start) || this.end.equal(line.end);
+  isSameEndpoint(line, eps = 1e-9) {
+    return this.start.equal(line.start, eps) || this.start.equal(line.end, eps) || this.end.equal(line.start, eps) || this.end.equal(line.end, eps);
   }
   /**
    * 相同端点是否为开始
    * @param line 
    * @returns 
    */
-  isSameEndpointAsStart(line) {
-    return this.start.equal(line.start) || this.start.equal(line.end);
+  isSameEndpointAsStart(line, eps = 1e-9) {
+    return this.start.equal(line.start, eps) || this.start.equal(line.end, eps);
   }
   /**
    * 相同端点是否为结束
    * @param line 
    * @returns 
    */
-  isSameEndpointAsEnd(line) {
-    return this.end.equal(line.start) || this.end.equal(line.end);
+  isSameEndpointAsEnd(line, eps = 1e-9) {
+    return this.end.equal(line.start, eps) || this.end.equal(line.end, eps);
   }
   /**
    * 获取共线点
    * @param line 
    * @returns 
    */
-  getSameEndpoint(line) {
-    if (this.start.equal(line.start)) return [this.start, line.start];
-    else if (this.start.equal(line.end)) return [this.start, line.end];
-    else if (this.end.equal(line.start)) return [this.end, line.start];
-    else if (this.end.equal(line.end)) return [this.end, line.end];
+  getSameEndpoint(line, eps = 1e-9) {
+    if (this.start.equal(line.start, eps)) return [this.start, line.start];
+    else if (this.start.equal(line.end, eps)) return [this.start, line.end];
+    else if (this.end.equal(line.start, eps)) return [this.end, line.start];
+    else if (this.end.equal(line.end, eps)) return [this.end, line.end];
     return null;
   }
   /**
@@ -608,7 +608,7 @@ class LineSegment {
    * @returns 
    */
   direction() {
-    return this.#direction.clone();
+    return this._direction.clone();
   }
   /**
    * 获取发向量-左法线
@@ -1058,8 +1058,8 @@ class Point {
    * @param point 
    * @returns 
    */
-  equal(point2) {
-    return Math.abs(point2.x - this.x) < 1e-9 && Math.abs(point2.y - this.y) < 1e-9;
+  equal(point2, eps = 1e-9) {
+    return Math.abs(point2.x - this.x) < eps && Math.abs(point2.y - this.y) < eps;
   }
   /**
    * 
@@ -2417,6 +2417,11 @@ class Quadtree {
     }));
     return array;
   }
+  static from(lines) {
+    const quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
+    lines.forEach((line) => quadtree.insert({ line, userData: void 0 }));
+    return quadtree;
+  }
 }
 class WallInsertObject {
   static mountedObjectType = [];
@@ -3655,6 +3660,33 @@ class LineSegmentUtils {
     }
     return points;
   }
+  static resolveIntersection(lines, onClip) {
+    const quadtree = Quadtree.from(lines), queryLine = new LineSegment(), arrayMap = new ArrayMap();
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      queryLine.copy(line).setLength(line.len + 0.04);
+      quadtree.queryLineSegment(queryLine).forEach((res) => {
+        if (res.line === line) return;
+        if (line.isSameEndpoint(res.line, 1e-4)) return;
+        const point2 = res.line.getIntersection(line);
+        if (!point2) return;
+        arrayMap.append(res.line, point2);
+      });
+    }
+    const newLines = [];
+    const removeSet = /* @__PURE__ */ new Set();
+    arrayMap.forEach((points, line) => {
+      if (points.length) {
+        let lines2 = LineSegmentUtils.clippingByPoints(line, points);
+        onClip?.(line, lines2);
+        newLines.push(...lines2);
+        removeSet.add(line);
+      } else newLines.push(line);
+    });
+    lines = lines.filter((line) => !removeSet.has(line));
+    lines.push(...newLines);
+    return lines;
+  }
   /** 对线段组统计，找到主导方向线
    * @param lineSegments 
    * @returns 
@@ -6010,39 +6042,25 @@ function migration(newLine, oldLine) {
   });
 }
 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) => {
-    const points = quadtree.queryLineSegment(line).map((res) => {
-      if (res.line === line) return;
-      const point2 = res.line.getIntersection(line);
-      if (!point2 || line.start.equal(point2) || line.end.equal(point2)) return;
-      return point2;
-    }).filter((i) => !!i);
-    if (points.length) {
-      const newLines2 = LineSegmentUtils.clippingByPoints(line, points);
-      newLines2.map((newLine) => migration(newLine, line));
-      if (line.userData.isBayWindow) {
-        newLines2.sort((a2, b4) => b4.length() - a2.length());
-        for (let i = 1; i < newLines2.length; i++) {
-          newLines2[i].userData.isBayWindow = false;
-        }
+  lines = LineSegmentUtils.resolveIntersection(lines, (line, newLines) => {
+    newLines.map((newLine) => migration(newLine, line));
+    if (line.userData.isBayWindow) {
+      newLines.sort((a2, b4) => b4.length() - a2.length());
+      for (let i = 1; i < newLines.length; i++) {
+        newLines[i].userData.isBayWindow = false;
       }
-      if (line.userData.isBalconyRailing) {
-        const len = line.length();
-        newLines2.forEach((line2) => {
-          if (line2.length() / len < 0.2) {
-            delete line2.userData.isBalconyRailing;
-          }
-        });
-      }
-      return newLines2;
     }
-    return line;
+    if (line.userData.isBalconyRailing) {
+      const len = line.length();
+      newLines.forEach((line2) => {
+        if (line2.length() / len < 0.2) {
+          delete line2.userData.isBalconyRailing;
+        }
+      });
+    }
   });
-  newLines = newLines.filter((line) => line.length() >= minLen);
-  quadtree.clear();
-  return dedup ? LineSegmentUtils.deduplication(newLines) : newLines;
+  lines = lines.filter((line) => line.length() >= minLen);
+  return dedup ? LineSegmentUtils.deduplication(lines) : lines;
 }
 class LineIndexGenerator {
   index = 0;
@@ -6641,7 +6659,6 @@ function clippingDoubleWall(lines) {
 }
 const miniCircles = new MiniCircles();
 function clippingInsertObjectDoubleWall(lines) {
-  if (lines.length === 4) return [lines];
   const hasInsertObject = lines.some((line) => WallInsertObject.isInsertObject(line));
   if (!hasInsertObject) return clippingDoubleWall(lines);
   const quadtree = createQuadtree(lines), poly = Polygon.fromByLines2(lines), far = 10;
@@ -6653,7 +6670,7 @@ function clippingInsertObjectDoubleWall(lines) {
       if (!poly.pointWithin(center.add(normal.clone().multiplyScalar(1e-6)))) normal.multiplyScalar(-1);
       WallInsertObject.forEachInsertObjectData(line, (data) => data.forEach((d2) => {
         const wioLine = wallInsertObjectToLine(line, d2);
-        wioLine.setLength(wioLine.len * 0.98);
+        wioLine.setLength(wioLine.len - 4e-3);
         const len = wioLine.length();
         let startResults = quadtree.raycaster(wioLine.start, normal, 1e-4, far).filter((item) => item.targetLine.isParallelTo(wioLine));
         let endResults = quadtree.raycaster(wioLine.end, normal, 1e-4, far).filter((item) => item.targetLine.isParallelTo(wioLine));
@@ -9689,6 +9706,7 @@ class ThreeVJiaPipeline extends Pipeline {
     if (info) {
       const { dottedLine, windowLine, depth, side } = info, line = new LineSegment(dottedLine.start.clone(), dottedLine.end.clone()), win = windowLine?.userData.drawWindow && windowLine.userData.drawWindow[0];
       if (side === "LEFT") line.swapValue();
+      line.translate(-DEFAULT_WALL_WIDTH * 0.5, line.normal());
       line.userData = {
         groundClearance: win?.groundClearance ?? 0,
         height: win?.height,
@@ -9815,17 +9833,27 @@ class ThreeVJiaPipeline extends Pipeline {
     if (roomPloys.length === 0) return json;
     publicInfo.itemInfo.forEach((item, i) => {
       if (!placeHoldersMap[item.category]) return;
-      const itemPoly = new Polygon(item.contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
+      const contour = item.quadContour ?? item.contour;
+      if (contour.length === 0) {
+        console.warn(`第${i}个物品轮廓为空`);
+        return;
+      }
+      const itemPoly = new Polygon(contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
       if (index2 < 0) return;
-      json.placeHolders.push({
-        name: placeHoldersMap[item.category],
-        polygon: itemPoly.getMinimumBoundingRectangle().map((p2) => p2.toJson2D()),
-        direction: Point.from(item.direction).rotate(Point.zero(), json.angle),
-        height: item.box.max.z - item.box.min.z,
-        sillHeight: item.box.min.z - z,
-        roomId: rooms[index2].roomTypeId,
-        id: i
-      });
+      try {
+        const rect = itemPoly.getMinimumBoundingRectangle().map((p2) => p2.toJson2D());
+        json.placeHolders.push({
+          name: placeHoldersMap[item.category],
+          polygon: rect,
+          direction: Point.from(item.direction).rotate(Point.zero(), json.angle),
+          height: item.box.max.z - item.box.min.z,
+          sillHeight: item.box.min.z - z,
+          roomId: rooms[index2].roomTypeId,
+          id: i
+        });
+      } catch (error) {
+        console.warn(`第${i}个物品解析异常`);
+      }
     });
     return json;
   }
@@ -9977,39 +10005,6 @@ const tools = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   toOriginalDataItem,
   wallInsertObjectToLine
 }, Symbol.toStringTag, { value: "Module" }));
-class Group {
-  type = "";
-  userData = { color: "#fff" };
-  constructor(lines = [], type = "", userData = {}) {
-    this.type = type;
-    this.addLine(...lines);
-    Object.assign(this.userData, userData);
-  }
-  lines = [];
-  /** 添加线段
-   * @param arg 
-   */
-  addLine(...arg) {
-    this.lines.push(...arg);
-  }
-  removeLine(...lines) {
-    if (lines.length === 0) return;
-    if (lines.length === 1) {
-      const index2 = this.lines.indexOf(lines[0]);
-      this.lines.splice(index2, 1);
-      return;
-    }
-    const set2 = new Set(lines);
-    this.lines = this.lines.filter((line) => !set2.has(line));
-  }
-  clone() {
-    const group = new this.constructor();
-    group.type = this.type;
-    group.lines = this.lines.map((line) => line.clone());
-    Object.assign(group.userData, this.userData);
-    return group;
-  }
-}
 const units = {
   Unitless: 1,
   // 无单位，1米 = 1（无单位）
@@ -10054,6 +10049,223 @@ const units = {
   Parsecs: 3240779289666404e-32
   // 秒差距，1米 ≈ 0.00000000000000003240779289666404秒差距
 };
+function toDrawData(unit = "Centimeters") {
+  if (!this.needUpdate && this._cachedDrawDataMap.has(unit)) return this._cachedDrawDataMap.get(unit);
+  this._cachedDrawDataMap.clear();
+  this.needUpdate = false;
+  const lines = this.groups.flatMap((group) => group.lines), s = units[unit], expansionWidth = 2, box = Box2.fromByLineSegment(...lines).expansion(expansionWidth), center = box.center, data = {
+    unit,
+    lines: [],
+    lines2: [],
+    arcs: [],
+    texts: [],
+    center: center.clone().multiplyScalar(s).toJson(),
+    width: box.width * s,
+    height: box.height * s,
+    scale: s
+  };
+  let color = "white";
+  function drawText2(str, p2) {
+    data.texts.push([str, p2.x * s, p2.y * s, color]);
+  }
+  function drawLine(p1, p2) {
+    data.lines.push([p1.x * s, p1.y * s, p2.x * s, p2.y * s, color]);
+  }
+  function drawLine2(p1, p2) {
+    data.lines2.push([p1.x * s, p1.y * s, p2.x * s, p2.y * s, color]);
+  }
+  function drawDottedLine(p1, p2, dash = 0.04, gap = 0.05, mode = "line") {
+    const distance2 = dash + gap;
+    let current = 0;
+    const direction = p2.directionFrom(p1);
+    const length = p1.distance(p2);
+    while (current < length) {
+      const dashEnd = Math.min(current + dash, length);
+      const start = p1.clone().add(direction.clone().multiplyScalar(current));
+      const end = p1.clone().add(direction.clone().multiplyScalar(dashEnd));
+      if (mode === "line") drawLine(start, end);
+      else drawLine2(start, end);
+      current += distance2;
+    }
+  }
+  const line = new LineSegment();
+  function drawRulerLine(p1, p2) {
+    line.set(p1, p2);
+    const length = line.length();
+    const angle = line.direction().angle(new Point(0, 1), { unit: "degree", range: "180" });
+    const p1C = p1.clone();
+    const p2C = p2.clone();
+    const offset = expansionWidth * 0.4;
+    if (Math.min(angle, 180 - angle) < 1) {
+      if (p1.x < center.x) {
+        p1C.x = box.minX + offset;
+        p2C.x = box.minX + offset;
+      } else {
+        p1C.x = box.maxX - offset;
+        p2C.x = box.maxX - offset;
+      }
+    } else {
+      if (p1.y < center.y) {
+        p1C.y = box.minY + offset;
+        p2C.y = box.minY + offset;
+      } else {
+        p1C.y = box.maxY - offset;
+        p2C.y = box.maxY - offset;
+      }
+    }
+    line.set(p1C, p2C);
+    drawDottedLine(p1C, p1, 0.04, 0.05, "line2");
+    drawDottedLine(p2C, p2, 0.04, 0.05, "line2");
+    drawLine2(p1C, p2C);
+    color = "white";
+    drawText2((length * 1e3).toFixed(0) + "mm", line.center);
+  }
+  function drawArc(pos, radius, startAngle, endAngle) {
+    data.arcs.push([
+      pos.x * s,
+      pos.y * s,
+      radius * s,
+      startAngle,
+      endAngle,
+      color
+    ]);
+  }
+  this.groups.forEach((group) => {
+    const set2 = this._drawHandlerMap.get(group.type);
+    if (!set2) return;
+    const option = { group, drawArc, drawLine, drawDottedLine, drawText: drawText2, drawRulerLine, setColor(c) {
+      color = c;
+    } };
+    set2.forEach((fun) => fun.handler(option));
+  });
+  this._cachedDrawDataMap.set(unit, data);
+  return data;
+}
+async function toDxfImageBlob(data, type = "image/jpeg", background = "#000") {
+  const margin = 0 * data.scale;
+  let canvas;
+  if (typeof window !== "undefined") {
+    canvas = document.createElement("canvas");
+  } else if (typeof global !== "undefined") {
+    const { createCanvas } = await include("canvas");
+    canvas = createCanvas(data.width + margin * 2, data.height + margin * 2);
+  } else {
+    throw new Error("创建画布失败");
+  }
+  const colors = {
+    cyan: "cyan",
+    yellow: "yellow",
+    white: "white"
+  };
+  canvas.width = data.width + margin * 2;
+  canvas.height = data.height + margin * 2;
+  const ctx = canvas.getContext("2d");
+  if (background) {
+    ctx.fillStyle = background;
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+  }
+  ctx.translate(-data.center.x + data.width * 0.5 + margin, data.center.y + data.height * 0.5 + margin);
+  ctx.scale(1, -1);
+  data.lines.forEach(([p1x, p1y, p2x, p2y, color]) => {
+    ctx.strokeStyle = colors[color] ?? color;
+    ctx.beginPath();
+    ctx.moveTo(p1x, p1y);
+    ctx.lineTo(p2x, p2y);
+    ctx.closePath();
+    ctx.stroke();
+  });
+  data.lines2.forEach(([p1x, p1y, p2x, p2y, color]) => {
+    ctx.strokeStyle = colors[color] ?? color;
+    ctx.beginPath();
+    ctx.moveTo(p1x, p1y);
+    ctx.lineTo(p2x, p2y);
+    ctx.closePath();
+    ctx.stroke();
+  });
+  data.arcs.forEach(([x, y, radius, startAngle, endAngle, color]) => {
+    ctx.strokeStyle = colors[color];
+    ctx.beginPath();
+    ctx.arc(x, y, radius, startAngle * (Math.PI / 180), endAngle * (Math.PI / 180));
+    ctx.stroke();
+  });
+  data.texts.forEach(([str, x, y, color]) => {
+    ctx.fillStyle = colors[color] ?? color ?? "#fff";
+    ctx.font = `${0.15 * data.scale}px Arial`;
+    ctx.textAlign = "center";
+    ctx.textBaseline = "middle";
+    ctx.save();
+    ctx.translate(x, y);
+    ctx.scale(1, -1);
+    ctx.fillText(str, 0, 0);
+    ctx.restore();
+  });
+  if ("toBlob" in canvas) {
+    return new Promise((resolve) => {
+      canvas.toBlob((b4) => {
+        resolve(b4);
+      }, type, 1);
+    });
+  } else {
+    const buffer = canvas.toBuffer(type, { quality: 1 });
+    return buffer;
+  }
+}
+function drawDxfString(data, unit = "Millimeters") {
+  const d2 = new Drawing();
+  d2.setUnits(unit);
+  d2.addLayer("cyan", Drawing.ACI.CYAN, "DOTTED");
+  d2.addLayer("yellow", Drawing.ACI.YELLOW, "DOTTED");
+  d2.addLayer("white", Drawing.ACI.WHITE, "DOTTED");
+  d2.addLayer("blue", Drawing.ACI.BLUE, "DOTTED");
+  d2.addLayer("green", Drawing.ACI.GREEN, "DOTTED");
+  d2.addLayer("layer", Drawing.ACI.LAYER, "DOTTED");
+  d2.addLayer("magenta", Drawing.ACI.MAGENTA, "DOTTED");
+  d2.addLayer("red", Drawing.ACI.RED, "DOTTED");
+  data.lines.forEach((item) => {
+    let [p1x, p1y, p2x, p2y, color] = item;
+    d2.setActiveLayer(color);
+    d2.drawLine(p1x, p1y, p2x, p2y);
+  });
+  data.arcs.forEach((item) => {
+    const [x, y, r2, startAngle, endAngle, color] = item;
+    d2.setActiveLayer(color);
+    d2.drawArc(x, y, r2, startAngle, endAngle);
+  });
+  return d2.toDxfString();
+}
+class Group {
+  type = "";
+  userData = { color: "#fff" };
+  constructor(lines = [], type = "", userData = {}) {
+    this.type = type;
+    this.addLine(...lines);
+    Object.assign(this.userData, userData);
+  }
+  lines = [];
+  /** 添加线段
+   * @param arg 
+   */
+  addLine(...arg) {
+    this.lines.push(...arg);
+  }
+  removeLine(...lines) {
+    if (lines.length === 0) return;
+    if (lines.length === 1) {
+      const index2 = this.lines.indexOf(lines[0]);
+      this.lines.splice(index2, 1);
+      return;
+    }
+    const set2 = new Set(lines);
+    this.lines = this.lines.filter((line) => !set2.has(line));
+  }
+  clone() {
+    const group = new this.constructor();
+    group.type = this.type;
+    group.lines = this.lines.map((line) => line.clone());
+    Object.assign(group.userData, this.userData);
+    return group;
+  }
+}
 class CAD {
   groups = [];
   _drawHandlerMap = new SetMap();
@@ -10199,169 +10411,14 @@ class CAD {
    */
   _cachedDrawDataMap = /* @__PURE__ */ new Map();
   toDrawData(unit = "Centimeters") {
-    if (!this.needUpdate && this._cachedDrawDataMap.has(unit)) return this._cachedDrawDataMap.get(unit);
-    this._cachedDrawDataMap.clear();
-    this.needUpdate = false;
-    const lines = this.groups.flatMap((group) => group.lines), s = units[unit], expansionWidth = 2, box = Box2.fromByLineSegment(...lines).expansion(expansionWidth), center = box.center, data = {
-      unit,
-      lines: [],
-      lines2: [],
-      arcs: [],
-      texts: [],
-      center: center.clone().multiplyScalar(s).toJson(),
-      width: box.width * s,
-      height: box.height * s,
-      scale: s
-    };
-    let color = "white";
-    function drawText2(str, p2) {
-      data.texts.push([str, p2.x * s, p2.y * s, color]);
-    }
-    function drawLine(p1, p2) {
-      data.lines.push([p1.x * s, p1.y * s, p2.x * s, p2.y * s, color]);
-    }
-    function drawLine2(p1, p2) {
-      data.lines2.push([p1.x * s, p1.y * s, p2.x * s, p2.y * s, color]);
-    }
-    function drawDottedLine(p1, p2, dash = 0.04, gap = 0.05, mode = "line") {
-      const distance2 = dash + gap;
-      let current = 0;
-      const direction = p2.directionFrom(p1);
-      const length = p1.distance(p2);
-      while (current < length) {
-        const dashEnd = Math.min(current + dash, length);
-        const start = p1.clone().add(direction.clone().multiplyScalar(current));
-        const end = p1.clone().add(direction.clone().multiplyScalar(dashEnd));
-        if (mode === "line") drawLine(start, end);
-        else drawLine2(start, end);
-        current += distance2;
-      }
-    }
-    const line = new LineSegment();
-    function drawRulerLine(p1, p2) {
-      line.set(p1, p2);
-      const length = line.length();
-      const angle = line.direction().angle(new Point(0, 1), { unit: "degree", range: "180" });
-      const p1C = p1.clone();
-      const p2C = p2.clone();
-      const offset = expansionWidth * 0.4;
-      if (Math.min(angle, 180 - angle) < 1) {
-        if (p1.x < center.x) {
-          p1C.x = box.minX + offset;
-          p2C.x = box.minX + offset;
-        } else {
-          p1C.x = box.maxX - offset;
-          p2C.x = box.maxX - offset;
-        }
-      } else {
-        if (p1.y < center.y) {
-          p1C.y = box.minY + offset;
-          p2C.y = box.minY + offset;
-        } else {
-          p1C.y = box.maxY - offset;
-          p2C.y = box.maxY - offset;
-        }
-      }
-      line.set(p1C, p2C);
-      drawDottedLine(p1C, p1, 0.04, 0.05, "line2");
-      drawDottedLine(p2C, p2, 0.04, 0.05, "line2");
-      drawLine2(p1C, p2C);
-      color = "white";
-      drawText2((length * 1e3).toFixed(0) + "mm", line.center);
-    }
-    function drawArc(pos, radius, startAngle, endAngle) {
-      data.arcs.push([
-        pos.x * s,
-        pos.y * s,
-        radius * s,
-        startAngle,
-        endAngle,
-        color
-      ]);
-    }
-    this.groups.forEach((group) => {
-      const set2 = this._drawHandlerMap.get(group.type);
-      if (!set2) return;
-      const option = { group, drawArc, drawLine, drawDottedLine, drawRulerLine, setColor(c) {
-        color = c;
-      } };
-      set2.forEach((fun) => fun.handler(option));
-    });
-    this._cachedDrawDataMap.set(unit, data);
-    return data;
+    return toDrawData.call(this, unit);
   }
   /** 转为图片
    * @param type 
    */
   async toDxfImageBlob(unit = "Centimeters", type = "image/jpeg", background = "#000") {
     const data = this.toDrawData(unit);
-    const margin = 0 * data.scale;
-    let canvas;
-    if (typeof window !== "undefined") {
-      canvas = document.createElement("canvas");
-    } else if (typeof global !== "undefined") {
-      const { createCanvas } = await include("canvas");
-      canvas = createCanvas(data.width + margin * 2, data.height + margin * 2);
-    } else {
-      throw new Error("创建画布失败");
-    }
-    const colors = {
-      cyan: "cyan",
-      yellow: "yellow",
-      white: "white"
-    };
-    canvas.width = data.width + margin * 2;
-    canvas.height = data.height + margin * 2;
-    const ctx = canvas.getContext("2d");
-    if (background) {
-      ctx.fillStyle = background;
-      ctx.fillRect(0, 0, canvas.width, canvas.height);
-    }
-    ctx.translate(-data.center.x + data.width * 0.5 + margin, data.center.y + data.height * 0.5 + margin);
-    ctx.scale(1, -1);
-    data.lines.forEach(([p1x, p1y, p2x, p2y, color]) => {
-      ctx.strokeStyle = colors[color] ?? color;
-      ctx.beginPath();
-      ctx.moveTo(p1x, p1y);
-      ctx.lineTo(p2x, p2y);
-      ctx.closePath();
-      ctx.stroke();
-    });
-    data.lines2.forEach(([p1x, p1y, p2x, p2y, color]) => {
-      ctx.strokeStyle = colors[color] ?? color;
-      ctx.beginPath();
-      ctx.moveTo(p1x, p1y);
-      ctx.lineTo(p2x, p2y);
-      ctx.closePath();
-      ctx.stroke();
-    });
-    data.arcs.forEach(([x, y, radius, startAngle, endAngle, color]) => {
-      ctx.strokeStyle = colors[color];
-      ctx.beginPath();
-      ctx.arc(x, y, radius, startAngle * (Math.PI / 180), endAngle * (Math.PI / 180));
-      ctx.stroke();
-    });
-    data.texts.forEach(([str, x, y, color]) => {
-      ctx.fillStyle = colors[color] ?? color ?? "#fff";
-      ctx.font = `${0.15 * data.scale}px Arial`;
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.save();
-      ctx.translate(x, y);
-      ctx.scale(1, -1);
-      ctx.fillText(str, 0, 0);
-      ctx.restore();
-    });
-    if ("toBlob" in canvas) {
-      return new Promise((resolve) => {
-        canvas.toBlob((b4) => {
-          resolve(b4);
-        }, type, 1);
-      });
-    } else {
-      const buffer = canvas.toBuffer(type, { quality: 1 });
-      return buffer;
-    }
+    return toDxfImageBlob(data, type, background);
   }
   /** 下载为图片
    * @param filename 
@@ -10389,28 +10446,8 @@ class CAD {
    * 将点json结构转换为Dxf string
    */
   toDxfString(unit = "Millimeters") {
-    const d2 = new Drawing();
-    d2.setUnits(unit);
-    d2.addLayer("cyan", Drawing.ACI.CYAN, "DOTTED");
-    d2.addLayer("yellow", Drawing.ACI.YELLOW, "DOTTED");
-    d2.addLayer("white", Drawing.ACI.WHITE, "DOTTED");
-    d2.addLayer("blue", Drawing.ACI.BLUE, "DOTTED");
-    d2.addLayer("green", Drawing.ACI.GREEN, "DOTTED");
-    d2.addLayer("layer", Drawing.ACI.LAYER, "DOTTED");
-    d2.addLayer("magenta", Drawing.ACI.MAGENTA, "DOTTED");
-    d2.addLayer("red", Drawing.ACI.RED, "DOTTED");
     const data = this.toDrawData(unit);
-    data.lines.forEach((item) => {
-      let [p1x, p1y, p2x, p2y, color] = item;
-      d2.setActiveLayer(color);
-      d2.drawLine(p1x, p1y, p2x, p2y);
-    });
-    data.arcs.forEach((item) => {
-      const [x, y, r2, startAngle, endAngle, color] = item;
-      d2.setActiveLayer(color);
-      d2.drawArc(x, y, r2, startAngle, endAngle);
-    });
-    return d2.toDxfString();
+    return drawDxfString(data, unit);
   }
   /**
    * 将点云结构转换为DXF格式
@@ -10560,15 +10597,6 @@ class DxfDrawPlugin {
         });
       }
     });
-    cad.addDrawHandler({
-      type: ["ruler"],
-      handler({ drawRulerLine, setColor, group }) {
-        setColor("cyan");
-        group.lines.forEach((line) => {
-          drawRulerLine(line.start, line.end);
-        });
-      }
-    });
     cad.addDrawHandler({
       type: ["balconyRailing"],
       handler({ group, setColor, drawLine }) {
@@ -10580,17 +10608,19 @@ class DxfDrawPlugin {
     });
   }
 }
-class DxfDataPlugin extends Pipeline {
+class DxfDataPlugin {
   manager;
   lines = [];
+  pipeline;
   constructor(lines) {
-    super();
     this.lines = lines;
     this.manager = WallGroupManager.fromByLines(lines);
-    this.init();
-  }
-  init() {
-    this.manager.forEach((group) => this.run(group.type, { lines: group.lines }));
+    this.pipeline = new Pipeline();
+    this.manager.forEach((group) => {
+      const option = { lines: group.lines };
+      this.pipeline.run(group.type, option);
+      group.lines = option.lines;
+    });
   }
   install(cad) {
     const wallGroupManager = this.manager, lines = this.lines;
@@ -10613,6 +10643,7 @@ class DxfDataPlugin extends Pipeline {
     cad.addGroupAndOffset([...untreatedWall], { type: "wall" });
     cad.addGroups(untreatedDoubleWallGroup, "doubleWall");
     cad.unionGroupAll("wall");
+    cad.addGroup(cad.getAllLines(), "measurement");
     const offsetWidth = 0.05;
     cad.addGroupAndOffset(balconyRailingLines, {
       offsetHalfWidth: offsetWidth * 0.5,
@@ -11157,9 +11188,9 @@ class DoubleWallHelper {
       quadtree.insert(line);
       lines.push(line);
     });
-    lines = lineSegmentClipping(lines, 1e-9);
     quadtree.clear();
     lines.push(...otherLines);
+    lines = lineSegmentClipping(lines, 1e-9);
     PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
     return lines.filter((line) => line.length() > 1e-9);
   }
@@ -11340,7 +11371,8 @@ function correction(lines, targettLine, option) {
   new WallInsertObject(newLines).recomputed().merge();
   newLines.push(...otherLines);
   newLines = removeDangline(newLines, 0.15, true);
-  return newLines.filter((line) => line.length() > 1e-9);
+  newLines = newLines.filter((line) => line.length() > 1e-9);
+  return newLines;
 }
 function axisAlignCorr(lines, option, verticalReferenceLine) {
   verticalReferenceLine = verticalReferenceLine ?? LineSegmentUtils.findDominantDirectionLine(lines.filter((line) => !line.userData.isDoor));

package/src/dxfSystem/components/Dxf.d.ts

@@ -71,20 +71,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     downloadOriginalData(filename: string): Promise<void>;
     /** 获取绘制数据
      */
-    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: {
-            x: number;
-            y: number;
-        };
-        width: number;
-        height: number;
-        scale: number;
-    } | undefined;
+    toDrawData(unit?: Unit): import('../utils/CAD/drawData').DrawData | undefined;
     /** 获取 dxf 图片 二进制对象
      * @param type
      */

package/src/dxfSystem/plugins/editor/components/CommandFlow/CFComponent.d.ts

@@ -169,12 +169,12 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
     }): {
         readonly ended: boolean;
         end: () => void;
-        next: (mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
+        next: (mode_: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
             point: Point;
             line?: LineSegment;
         } | null>;
         setBaseLine(line: LineSegment<Record<string, any>> | null, point: Point | null): void;
-        points(mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): {
+        points(mode_: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): {
             next(): Promise<{
                 value: {
                     point: Point;
@@ -190,15 +190,15 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
         awaitEach(callBack: (result: {
             point: Point<Record<string, any>>;
             line?: LineSegment;
-        } | null) => void, mode_?: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise<{
+        } | null) => void, mode_?: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise<{
             readonly ended: boolean;
             end: () => void;
-            next: (mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
+            next: (mode_: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
                 point: Point;
                 line?: LineSegment;
             } | null>;
             setBaseLine(line: LineSegment<Record<string, any>> | null, point: Point | null): void;
-            points(mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): {
+            points(mode_: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): {
                 next(): Promise<{
                     value: {
                         point: Point;
@@ -214,7 +214,7 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
             awaitEach(callBack: (result: {
                 point: Point<Record<string, any>>;
                 line?: LineSegment;
-            } | null) => void, mode_?: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise</*elided*/ any>;
+            } | null) => void, mode_?: "all" | "line" | "point" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise</*elided*/ any>;
         }>;
     };
     /**

package/src/dxfSystem/type.d.ts

@@ -103,19 +103,6 @@ export type OriginalDataItem = {
  * [开始点, 结束点, 相交点, 是否是门, 索引]
  */
 export type DataItem = [Point, Point, number[], boolean, number];
-export type DrawData = {
-    unit: Unit;
-    line: [number, number, number, number, string][];
-    arc: [number, number, number, number, number, string][];
-    dimensionLine: number[][];
-    center: {
-        x: number;
-        y: number;
-    };
-    width: number;
-    height: number;
-    scale: number;
-};
 export type FittingMethodType = "average" | "max";
 export type SetDataOption = {
     /**
@@ -190,6 +177,11 @@ export type ItemInfo = {
         y: number;
         z: number;
     }[];
+    quadContour?: {
+        x: number;
+        y: number;
+        z: number;
+    }[];
     direction: {
         x: number;
         y: number;

package/src/dxfSystem/utils/CAD/drawData.d.ts

@@ -0,0 +1,43 @@
+import { Unit } from '../../type';
+import { CAD } from '.';
+export 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: {
+        x: number;
+        y: number;
+    };
+    width: number;
+    height: number;
+    scale: number;
+};
+export declare const units: {
+    Unitless: number;
+    Inches: number;
+    Feet: number;
+    Miles: number;
+    Millimeters: number;
+    Centimeters: number;
+    Meters: number;
+    Kilometers: number;
+    Microinches: number;
+    Mils: number;
+    Yards: number;
+    Angstroms: number;
+    Nanometers: number;
+    Microns: number;
+    Decimeters: number;
+    Decameters: number;
+    Hectometers: number;
+    Gigameters: number;
+    "Astronomical units": number;
+    "Light years": number;
+    Parsecs: number;
+};
+/**
+ * 转为绘制数据
+ */
+export declare function toDrawData(this: CAD, unit?: Unit): DrawData;

package/src/dxfSystem/utils/CAD/drawDxfImage.d.ts

@@ -0,0 +1,2 @@
+import { DrawData } from './drawData';
+export declare function toDxfImageBlob(data: DrawData, type?: string, background?: string): Promise<any>;

package/src/dxfSystem/utils/CAD/drawDxfString.d.ts

@@ -0,0 +1,3 @@
+import { Unit } from '../../type';
+import { DrawData } from './drawData';
+export declare function drawDxfString(data: DrawData, unit?: Unit): string;

package/src/dxfSystem/utils/{CAD.d.ts → CAD/index.d.ts}

@@ -1,8 +1,9 @@
-import { LineSegment } from '../../utils/algorithms/LineSegment';
-import { LineUserData, Unit } from '../type';
-import { Point } from '../../utils/algorithms/Point';
-import { WallGroupManager } from './WallGroupManager';
-import { Pipeline } from '../../utils/algorithms/Pipeline';
+import { LineSegment } from '../../../utils/algorithms/LineSegment';
+import { LineUserData, Unit } from '../../type';
+import { SetMap } from '../../../utils/algorithms/Map';
+import { Point } from '../../../utils/algorithms/Point';
+import { WallGroupManager } from '../WallGroupManager';
+import { Pipeline } from '../../../utils/algorithms/Pipeline';
 type LineSegmentType = LineSegment<LineUserData>;
 type JoinType = "jtMiter" | "jtSquare" | "jtRound";
 type EndType = "etOpenSquare" | "etOpenButt" | "etOpenRound";
@@ -26,6 +27,7 @@ export type CADDrawHandler = {
         drawArc(pos: Point, radius: number, startAngle: number, endAngle: number): void;
         drawDottedLine(p1: Point, p2: Point, dash?: number, gap?: number): void;
         drawRulerLine(p1: Point, p2: Point): void;
+        drawText(str: string, p: Point): void;
         group: Group;
         setColor: (color: string) => void;
     }) => void;
@@ -51,7 +53,7 @@ declare class Group {
  */
 export declare class CAD {
     groups: Group[];
-    private _drawHandlerMap;
+    _drawHandlerMap: SetMap<string, CADDrawHandler>;
     needUpdate: boolean;
     getAllLines(): LineSegmentType[];
     /** 添加组
@@ -98,8 +100,8 @@ export declare class CAD {
     /**
      * 转为绘制数据
      */
-    private _cachedDrawDataMap;
-    toDrawData(unit?: Unit): DrawData;
+    _cachedDrawDataMap: Map<string, DrawData>;
+    toDrawData(unit?: Unit): import('./drawData').DrawData;
     /** 转为图片
      * @param type
      */
@@ -157,11 +159,11 @@ type DataOption = {
 };
 /** dxf 数据处理插件
  */
-export declare class DxfDataPlugin extends Pipeline<DataOption> implements ICADPlugin {
+export declare class DxfDataPlugin implements ICADPlugin {
     manager: WallGroupManager;
     lines: LineSegment<LineUserData>[];
+    pipeline: Pipeline<DataOption>;
     constructor(lines: LineSegment<LineUserData>[]);
-    init(): void;
     install(cad: CAD): void;
 }
 export {};

package/src/dxfSystem/utils/lineSegmentClipping.d.ts

@@ -5,4 +5,4 @@ import { LineUserData } from '../type';
  * @param minLen
  * @returns
  */
-export declare function lineSegmentClipping(lines: LineSegment<LineUserData>[], minLen?: number, dedup?: boolean): LineSegment<Record<string, any>>[];
+export declare function lineSegmentClipping(lines: LineSegment<LineUserData>[], minLen?: number, dedup?: boolean): LineSegment<Record<string, any>>[] | LineSegment<LineUserData>[];

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

@@ -4,16 +4,18 @@ import { Rectangle } from './Rectangle';
  * 非轴对称线段
  */
 export declare class LineSegment<T = Record<string, any>> {
-    #private;
     static get LINE_SYMBOL(): symbol;
     points: Point[];
     userData: T;
     currentData: Record<string | number | symbol, any>;
     uuid: string;
+    private _length;
     get len(): number;
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;
+    _center: Point<Record<string, any>>;
     get center(): Point<Record<string, any>>;
+    _direction: Point<Record<string, any>>;
     constructor(p1?: Point, p2?: Point);
     private _initLenListener;
     set(p1: Point, p2: Point): this;
@@ -41,25 +43,25 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param line
      * @returns
      */
-    isSameEndpoint(line: LineSegment): boolean;
+    isSameEndpoint(line: LineSegment, eps?: number): boolean;
     /**
      * 相同端点是否为开始
      * @param line
      * @returns
      */
-    isSameEndpointAsStart(line: LineSegment): boolean;
+    isSameEndpointAsStart(line: LineSegment, eps?: number): boolean;
     /**
      * 相同端点是否为结束
      * @param line
      * @returns
      */
-    isSameEndpointAsEnd(line: LineSegment): boolean;
+    isSameEndpointAsEnd(line: LineSegment, eps?: number): boolean;
     /**
      * 获取共线点
      * @param line
      * @returns
      */
-    getSameEndpoint(line: LineSegment): Point<Record<string, any>>[] | null;
+    getSameEndpoint(line: LineSegment, eps?: number): Point<Record<string, any>>[] | null;
     /**
      * 判断一个点是否在当前线段上（包含端点）
      * @param point 要判断的点

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

@@ -113,6 +113,7 @@ export declare class LineSegmentUtils {
      * @returns
      */
     static flatPoints(lines: LineSegment[] | LineSegment): any[];
+    static resolveIntersection<T>(lines: LineSegment[], onClip?: (target: LineSegment<T>, newLines: LineSegment<T>[]) => void): LineSegment<T>[];
     /** 对线段组统计，找到主导方向线
      * @param lineSegments
      * @returns

package/src/utils/algorithms/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/algorithms/Quadtree.d.ts

@@ -85,4 +85,5 @@ export declare class Quadtree<T = any> {
      * @returns
      */
     boundsToArray(array?: number[], colors?: number[], recursion?: boolean): number[];
+    static from(lines: LineSegment[]): Quadtree<any>;
 }