mxcad 1.0.364 → 1.0.365

package/dist/mxcad.d.ts

@@ -2656,7 +2656,7 @@ export declare class MxCADUtilityClass {
 	 * @param dX - 坐标点的 X 坐标值
 	 * @param dY - 坐标点的 Y 坐标值
 	 * @param dZ - 坐标点的 Z 坐标值
-	 * @param dSearhRange - 查找范围，默认为 -1（表示查找整个绘图区域）
+	 * @param dSearhRange - 设置选取范围，默认为 -1  表示自适应，或者输入对应的CAD坐标长度
 	 * @param filter - 过滤器，用于过滤查找到的图形对象，默认为 null（表示不进行过滤）
 	 * @returns 返回查找到的图形对象的 ID
 	 * @example

package/dist/mxcad.es.js

@@ -15080,7 +15080,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.363";
+const version$1 = "1.0.364";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -22038,6 +22038,8 @@ function calculateDistanceFromPointToLine(pointToCheck, pointA, pointB) {
 function selectLineSegmentFromPolylineByPoint(ent, selectPt) {
   var distanceTolerance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var num = ent.numVerts();
+  var res = void 0;
+  var minDist = Number.MAX_VALUE;
   for (var index = 0; index < ent.numVerts(); index++) {
     var pt = ent.getPointAt(index).val;
     var nextPt = ent.getPointAt(index + 1).val;
@@ -22048,8 +22050,10 @@ function selectLineSegmentFromPolylineByPoint(ent, selectPt) {
         nextPt = ent.getPointAt(0).val;
         isClosed = true;
       }
-      if (nextPt && calculateDistanceFromPointToLine(selectPt, pt, nextPt) < distanceTolerance) {
-        return {
+      var dist = calculateDistanceFromPointToLine(selectPt, pt, nextPt);
+      if (nextPt && dist < minDist) {
+        minDist = dist;
+        res = {
           start: pt,
           end: nextPt,
           startIndex: index,
@@ -22095,6 +22099,7 @@ function selectLineSegmentFromPolylineByPoint(ent, selectPt) {
       };
     }
   }
+  return res;
 }
 function darkenColor(color, factor) {
   var r = color.r;
@@ -40900,38 +40905,37 @@ function createThickLine(start, end) {
   return new THREE.Mesh(geometry, material);
 }
 function calculateChamferDistance(line1, line2, d1, theta) {
-  if (d1 <= 0) throw new Error("d1 must be positive");
-  if (theta <= 0 || theta >= Math.PI) {
-    throw new Error("theta must be in (0, \u03C0) radians");
-  }
-  var dir1 = getDirectionVector(line1);
-  var dir2 = getDirectionVector(line2);
-  var phi = calculateAngleBetweenVectors(dir1, dir2);
-  if (theta + phi >= Math.PI) {
-    throw new Error("theta (".concat(theta, " rad) + phi (").concat(phi, " rad) >= \u03C0, chamfer undefined."));
+  var intersects = line1.IntersectWith(line2, McDb.Intersect.kExtendBoth);
+  if (intersects.length() === 0) return false;
+  var V = intersects.at(0);
+  var dir1 = line1.endPoint.clone().sub(line1.startPoint).normalize();
+  var dir2 = line2.endPoint.clone().sub(line2.startPoint).normalize();
+  var vToStart1 = line1.startPoint.clone().sub(V);
+  if (vToStart1.dotProduct(dir1) > 0) dir1 = dir1.negate();
+  var vToStart2 = line2.startPoint.clone().sub(V);
+  if (vToStart2.dotProduct(dir2) > 0) dir2 = dir2.negate();
+  var dot = dir1.dotProduct(dir2);
+  dot = Math.max(-1, Math.min(1, dot));
+  var alpha = Math.acos(dot);
+  var maxTheta = Math.PI - alpha - 1e-6;
+  if (theta <= 1e-6) {
+    console.warn("Theta too small. Must be > 0.");
+    return false;
   }
-  var denom = Math.sin(theta + phi);
-  if (Math.abs(denom) < 1e-12) {
-    throw new Error("theta + phi is too close to 0 or \u03C0, chamfer undefined");
+  if (theta >= Math.PI - alpha) {
+    var maxDeg = (maxTheta * 180 / Math.PI).toFixed(2);
+    var givenDeg = (theta * 180 / Math.PI).toFixed(2);
+    console.warn("Invalid theta: ".concat(givenDeg, "\xB0. Maximum allowed: ").concat(maxDeg, "\xB0 (since line angle = ").concat((alpha * 180 / Math.PI).toFixed(2), "\xB0)."));
+    return false;
   }
-  var d2 = d1 * Math.sin(theta) / denom;
-  if (d2 <= 0) {
-    console.warn("Computed d2 = ".concat(d2, " is non-positive. Check angle definitions."));
+  var sinTheta = Math.sin(theta);
+  var sinAlphaPlusTheta = Math.sin(alpha + theta);
+  if (Math.abs(sinAlphaPlusTheta) < 1e-12) {
+    return false;
   }
+  var d2 = d1 * (sinTheta / sinAlphaPlusTheta);
   return d2;
 }
-function getDirectionVector(line) {
-  var dx = line.endPoint.x - line.startPoint.x;
-  var dy = line.endPoint.y - line.startPoint.y;
-  var len = Math.hypot(dx, dy);
-  if (len < 1e-12) throw new Error("Line points are identical");
-  return [dx / len, dy / len];
-}
-function calculateAngleBetweenVectors(v1, v2) {
-  var dot = v1[0] * v2[0] + v1[1] * v2[1];
-  var clampedDot = Math.max(-1, Math.min(1, dot));
-  return Math.acos(clampedDot);
-}
 var getPointInfo = function getPointInfo(pl, index) {
   var bulge = pl.getBulgeAt(index);
   var point = pl.getPointAt(index).val;
@@ -42408,10 +42412,10 @@ var onKeyup = function onKeyup(e) {
 window.addEventListener("keydown", onKeydown);
 window.addEventListener("keyup", onKeyup);
 var mxChamferStorrage = createReactiveStorage({
-  length: 0,
+  length: 10,
   angle: 0,
-  dist: 0,
-  dist1: 0,
+  dist: 10,
+  dist1: 10,
   isAngleChamfer: false,
   isPruning: true,
   isMultiple: false
@@ -42434,7 +42438,7 @@ function _Mx_Chamfer() {
           isAngleChamfer = mxChamferStorrage.isAngleChamfer;
           isPruning = mxChamferStorrage.isPruning;
           isMultiple = mxChamferStorrage.isMultiple;
-          MxFun.acutPrintf("\n(".concat(isPruning ? "\u4FEE\u526A" : "\u4E0D\u4FEE\u526A", "\u6A21\u5F0F) \u5F53\u524D").concat(isAngleChamfer ? "\u5012\u89D2\u957F\u5EA6 = " + chamferDist.toFixed(4) + ", \u89D2\u5EA6 = " + Math.trunc(chamferAngle / (Math.PI / 180)) : "\u5012\u89D2\u8DDD\u79BB1 = " + chamferDist.toFixed(4) + ", \u8DDD\u79BB2 = " + chamferDist1.toFixed(4), "\n"));
+          MxFun.acutPrintf("\n(".concat(isPruning ? "\u4FEE\u526A" : "\u4E0D\u4FEE\u526A", "\u6A21\u5F0F) \u5F53\u524D").concat(isAngleChamfer ? "\u5012\u89D2\u957F\u5EA6 = " + chamferDist.toFixed(4) + ", \u89D2\u5EA6 = " + THREE.MathUtils.radToDeg(chamferAngle).toFixed(2) : "\u5012\u89D2\u8DDD\u79BB1 = " + chamferDist.toFixed(4) + ", \u8DDD\u79BB2 = " + chamferDist1.toFixed(4), "\n"));
           getChamferDists = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee11() {
               var getDist, dist2, dist1;
@@ -42505,7 +42509,7 @@ function _Mx_Chamfer() {
                   case 9:
                     mxChamferStorrage.length = chamferLength = length;
                     getAngle = new MxCADUiPrAngle();
-                    getAngle.setMessage("\u6307\u5B9A\u7B2C\u4E00\u6761\u76F4\u7EBF\u7684\u5012\u89D2\u89D2\u5EA6<".concat(Math.trunc(chamferAngle / (Math.PI / 180)), ">"));
+                    getAngle.setMessage("\u6307\u5B9A\u7B2C\u4E00\u6761\u76F4\u7EBF\u7684\u5012\u89D2\u89D2\u5EA6<".concat(THREE.MathUtils.radToDeg(chamferAngle).toFixed(2), "\xB0>"));
                     getAngle.setKeyWords("");
                     getDist.clearLastInputPoint();
                     _context15.next = 16;
@@ -42532,15 +42536,15 @@ function _Mx_Chamfer() {
             };
           }();
           _loop4 = /*#__PURE__*/regenerator.mark(function _loop4() {
-            var getEnt, filter, objId, _loop5, _ret5, getKey, key, _getKey2, _key2, pt1, lineEnt, filter1, drawSelectLine, selectLineInfo, isChamferLengthWarningShow, showWarning, exit, calculateAndApplyChamferBetweenTwoLines, oLineId, oLine, line, pt2, _line, _oLine, iPoints, dist1, dist2, _ref7, line1, line2, apply, is;
+            var filter, getEnt, objId, _loop5, _ret5, getKey, key, _getKey2, _key2, pt1, lineEnt, filter1, drawSelectLine, selectLineInfo, isChamferLengthWarningShow, showWarning, exit, calculateAndApplyChamferBetweenTwoLines, oLineId, oLine, line, pt2, _line, _oLine, iPoints, dist1, dist2, _ref7, line1, line2, apply, is;
             return regenerator.wrap(function _loop4$(_context17) {
               while (1) switch (_context17.prev = _context17.next) {
                 case 0:
-                  getEnt = new MxCADUiPrEntity();
-                  getEnt.setDynamicInputType(DynamicInputType.kNoInput);
                   filter = new MxCADResbuf();
                   filter.AddMcDbEntityTypes("LINE,LWPOLYLINE");
+                  getEnt = new MxCADUiPrEntity();
                   getEnt.setFilter(filter);
+                  getEnt.setDynamicInputType(DynamicInputType.kNoInput);
                   getEnt.setMessage("\u9009\u62E9\u4E00\u6761\u76F4\u7EBF");
                   getEnt.setKeyWords("[\u653E\u5F03(U)/\u591A\u6BB5\u7EBF(P)/\u8DDD\u79BB(D)/\u89D2\u5EA6(A)/\u4FEE\u526A(T)/\u65B9\u5F0F(E)/\u591A\u4E2A(M)]");
                   getEnt.setUserDraw(function (pt, pw) {
@@ -43215,6 +43219,7 @@ function _Mx_Chamfer() {
                         return is;
                       };
                       if (isAngleChamfer) {
+                        chamferDist2 = chamferLength;
                         var val = calculateChamferDistance(line, oLine, chamferLength, chamferAngle);
                         if (val) {
                           chamferDist12 = val;
@@ -43855,7 +43860,7 @@ function _Mx_Fillet() {
     return regenerator.wrap(function _callee15$(_context22) {
       while (1) switch (_context22.prev = _context22.next) {
         case 0:
-          radius = Number(localStorage.getItem("Mx_Fillet_radius")) || 0;
+          radius = Number(localStorage.getItem("Mx_Fillet_radius")) || 10;
           isPruning = localStorage.getItem("Mx_Fillet_isPruning") === "false" ? false : true;
           isMultiple = false;
           MxFun.acutPrintf("\n\u5F53\u524D\u8BBE\u7F6E: \u6A21\u5F0F = ".concat(isPruning ? "\u4FEE\u526A" : "\u4E0D\u4FEE\u526A", ", \u534A\u5F84 = ").concat(radius.toFixed(4)));