rm-graphical-computing-node 1.0.83 → 1.0.85

package/dist/index.mjs

@@ -5812,8 +5812,26 @@ var getColLine = async (lines, runDataList, collectDataPath, pointCloudCluster =
       y: p.y
     })
   });
+  function lineSkip(line2) {
+    if (!line2 || line2.isDoor || line2.doorAndBeamData && line2.doorAndBeamData.length > 0 || line2.drawWindow && line2.drawWindow.length > 0 || line2.isHoleWindow)
+      return true;
+    return false;
+  }
   for (let i = 0; i < result.length; i++) {
-    if (result[i].uuids.length < 4 || result[i].area < minArea || result[i].area > maxArea)
+    result[i].isSkip = false;
+    if (result[i].uuids.length < 4 || result[i].area < minArea || result[i].area > maxArea) {
+      result[i].isSkip = true;
+      continue;
+    }
+    for (let j = 0; j < result[i].lineIndexes.length; j++) {
+      if (lineSkip(lines[result[i].lineIndexes[j]])) {
+        result[i].isSkip = true;
+        break;
+      }
+    }
+  }
+  for (let i = 0; i < result.length; i++) {
+    if (result[i].isSkip)
       continue;
     let isRect = false;
     let overlapWallLines = [];
@@ -6134,7 +6152,7 @@ var getColLine = async (lines, runDataList, collectDataPath, pointCloudCluster =
       if (tmpLineData.checkResults.length != 1) continue;
       lines2.push(tmpLineData);
     }
-    await penetratingTask(lines2, trajectoryObj, collectDataPath, 0.5);
+    await penetratingTask(lines2, trajectoryObj, collectDataPath, 0.3);
     for (let i = 0; i < lines2.length; i++) {
       let len = lines2[i].checkResults[0].allCenterPoints.length;
       const allCenterPoints = lines2[i].allCenterPoints;
@@ -12487,6 +12505,7 @@ import { randomUUID as randomUUID2 } from "crypto";
 var getDoorPcdData = (lines, pcdData) => {
   if (!lines || !lines.length || !pcdData || !pcdData.length)
     return lines;
+  const pcdToLineDist = 0.1;
   for (let i = 0; i < pcdData.length; i++) {
     const pcd = pcdData[i];
     if (pcd.category != "door" || pcd.isFindBeam)
@@ -12524,7 +12543,7 @@ var getDoorPcdData = (lines, pcdData) => {
       let ptEnd2 = getPt3(line3.end);
       ptStart2.z = ptEnd2.z = ptMid1.z;
       let classify = classifySegments(ptMid1, ptMid2, ptStart2, ptEnd2);
-      if (classify.type == "collinear_overlap" && classify.maxPerpendicularDistance < 0.3) {
+      if (classify.type == "collinear_overlap" && classify.maxPerpendicularDistance < pcdToLineDist) {
         eligibilityLines.push(line3);
         eligibilityLinesIndexs.push(j);
       }
@@ -12556,8 +12575,8 @@ var getDoorPcdData = (lines, pcdData) => {
     const line2 = tmpLines[maxIndex];
     let ptStart = getPt3(line2.start);
     let ptEnd = getPt3(line2.end);
-    let intersect1 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt1, ptShortEd1, 0.3);
-    let intersect2 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt2, ptShortEd2, 0.3);
+    let intersect1 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt1, ptShortEd1, pcdToLineDist);
+    let intersect2 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt2, ptShortEd2, pcdToLineDist);
     if (intersect1 != null && intersect2 != null) {
       if (line2.mergeIndexs) {
         let tmpIndex = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rm-graphical-computing-node",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "墙体/梁线/点云语义计算库（依赖 Python 与 three.js）",
   "type": "module",
   "main": "dist/index.mjs",