rm-graphical-computing-node 1.0.65 → 1.0.67

package/dist/index.mjs

@@ -4755,8 +4755,6 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
               else
                 dataType = nearWall && lineLength > 0.8 ? "beam" : "hole";
             }
-            if (dataType != "beam" && lines[index].isLine2)
-              continue;
             doorAndBeamDataObj.type = dataType;
             doorAndBeamDataObj.wallBelowBeam = wallBelowBeam;
             for (let w2 = 0; w2 < doorBeamDataIndex.length; w2++) {
@@ -4823,15 +4821,13 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
                     let Z1 = getPointsMinAndMax(lines[doorBeamDataIndex[w2].linesIndex].originalPoints);
                     let Z2 = getPointsMinAndMax(line2.originalPoints);
                     lines[doorBeamDataIndex[w2].linesIndex].originalPoints = null;
-                    if (Z1.minZ > lines[doorBeamDataIndex[w2].linesIndex].start.z && Z1.minZ - lines[doorBeamDataIndex[w2].linesIndex].start.z > 1 && Z2.minZ > line2.start.z && Z2.minZ - line2.start.z > 1) {
-                      lineIsOnlyBeam1 = length1 > length22;
-                      lineIsOnlyBeam2 = length1 < length22;
-                      if (length22 > length1) {
-                        doorAndBeamDataObj.isExtend = true;
-                      }
-                      if (length1 > length22) {
-                        lines[doorBeamDataIndex[w2].linesIndex].isExtend = true;
-                      }
+                    lineIsOnlyBeam1 = length1 > length22;
+                    lineIsOnlyBeam2 = length1 < length22;
+                    if (length22 > length1) {
+                      doorAndBeamDataObj.isExtend = true;
+                    }
+                    if (length1 > length22) {
+                      lines[doorBeamDataIndex[w2].linesIndex].isExtend = true;
                     }
                   }
                   if (length1 < length22 && !lineIsOnlyBeam2 || lineIsOnlyBeam1) {
@@ -4911,6 +4907,8 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
                 }
               }
             }
+            if (dataType != "beam" && lines[index].isLine2 && doorAndBeamDataObj.nearId == -1)
+              continue;
             if (doorAndBeamDataObj.nearId != -1 && dataType == "hole") {
               let isBreak = false;
               for (let x = 0; x < lines.length; x++) {
@@ -5157,15 +5155,6 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
     if (onProgress != null)
       onProgress(100);
   }
-  let tmpLines = [];
-  for (let i = 0; i < lines.length; i++) {
-    if (!lines[i].isLine2)
-      tmpLines.push(lines[i]);
-    if (lines[i].isLine2 && lines[i].doorAndBeamData.length != 0)
-      tmpLines.push(lines[i]);
-  }
-  lines.length = 0;
-  lines.push(...tmpLines);
   return { lines, beamGroup, pcdData };
 };
 var checkBeamIsReasonable = async (lines, lineReader) => {

package/package.json

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