mxcad 1.0.237 → 1.0.238

package/dist/mxcad.d.ts

@@ -16969,6 +16969,12 @@ export declare class Mx3dGeCSYSR extends Mx3dGeObject {
 	 * @param x_vec 坐标系的 X 轴向量。
 	 */
 	constructor(origin: Mx3dGePoint, z_axis: Mx3dGeDir, x_vec: Mx3dGeDir);
+	/**
+	 * 使用原点、Z 轴方向创建一个右手坐标系对象，X Y 方向自动确定。
+	 * @param origin 坐标系的原点。
+	 * @param z_axis 坐标系的 Z 轴方向。
+	 */
+	constructor(origin: Mx3dGePoint, z_axis: Mx3dGeDir);
 	/**
 	 * 获取右手坐标系的原点位置。
 	 * @returns 原点位置。
@@ -19711,7 +19717,7 @@ export declare class Mx3dMkPrism extends Mx3dMkObject {
 	 * @param Copy 是否复制形状。
 	 * @param Canonize 是否规范化方向向量。
 	 */
-	constructor(S: Mx3dShapeObject, V: Mx3dGeVec, Copy: boolean, Canonize: boolean);
+	constructor(S: Mx3dShapeObject, V: Mx3dGeVec, Copy?: false, Canonize?: true);
 	/**
 	 * 构造函数，接受一个拓扑形状和一个方向来创建拉伸扫掠体。
 	 * @param S 拓扑形状对象。
@@ -19720,7 +19726,7 @@ export declare class Mx3dMkPrism extends Mx3dMkObject {
 	 * @param Copy 是否复制形状。
 	 * @param Canonize 是否规范化方向。
 	 */
-	constructor(S: Mx3dShapeObject, D: Mx3dGeDir, Inf: boolean, Copy: boolean, Canonize: boolean);
+	constructor(S: Mx3dShapeObject, D: Mx3dGeDir, Inf?: true, Copy?: false, Canonize?: true);
 	/**
 	 * 执行拉伸扫掠体的建模算法。
 	 */

package/dist/mxcad.es.js

@@ -14145,7 +14145,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312(hexstr);
 };
 
-const version$1 = "1.0.237";
+const version$1 = "1.0.238";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -16290,7 +16290,7 @@ var McDbCurve = /*#__PURE__*/function (_McDbEntity) {
     key: "getEndPoint",
     value: function getEndPoint() {
       return {
-        val: new McGePoint3d(this.imp.getStartPoint()),
+        val: new McGePoint3d(this.imp.getEndPoint()),
         ret: MxCpp.getCallResult() == 0
       };
     }
@@ -25421,7 +25421,7 @@ var getCanvasId = function getCanvasId(canvas) {
   if (typeof canvas === "string" && canvas.length > 0) {
     _canvas = document.querySelector(canvas);
     if (!_canvas) {
-      return canvas;
+      return canvas.replace(/^#/, "");
     }
   } else if (canvas instanceof HTMLCanvasElement) {
     _canvas = canvas;
@@ -26447,7 +26447,7 @@ function _drawPolyLine() {
           window.addEventListener("keydown", onKeydown);
           window.addEventListener("keyup", onkeyup);
           _loop = /*#__PURE__*/regenerator.mark(function _loop() {
-            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline10, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData10, _iSize8, _pPolyline11, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, retBulge, _nextData11, _iSize9, _pPolyline12, _getWidth3, _dWVal3;
+            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline10, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData10, _iSize8, _pPolyline11, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, _midPoint4, arc, retBulge, _nextData11, _iSize9, _pPolyline12, _getWidth3, _dWVal3;
             return regenerator.wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -26650,7 +26650,7 @@ function _drawPolyLine() {
                 case 104:
                   return _context.abrupt("return", 0);
                 case 105:
-                  _context.next = 493;
+                  _context.next = 495;
                   break;
                 case 107:
                   _sPrompt = _ML_String("NO1_ID_ARX_PL5", "\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
@@ -26719,11 +26719,11 @@ function _drawPolyLine() {
                     _pPolyline2.addVertexAt(vecData[iSize - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline2));
                   }
-                  _context.next = 493;
+                  _context.next = 495;
                   break;
                 case 132:
                   if (!(_getNextPoint.getStatus() == MrxDbgUiPrBaseReturn.kKeyWord)) {
-                    _context.next = 492;
+                    _context.next = 494;
                     break;
                   }
                   if (!_getNextPoint.isKeyWordPicked("A")) {
@@ -27306,11 +27306,11 @@ function _drawPolyLine() {
                     break;
                   }
                   isDrawLine = true;
-                  _context.next = 490;
+                  _context.next = 492;
                   break;
                 case 437:
                   if (!_getNextPoint.isKeyWordPicked("S")) {
-                    _context.next = 461;
+                    _context.next = 463;
                     break;
                   }
                   _pt8 = new McGePoint3d(vecData[vecData.length - 1].pt.x, vecData[vecData.length - 1].pt.y, 0);
@@ -27332,6 +27332,11 @@ function _drawPolyLine() {
                   getThirdPoint.setUserDraw(function (currendPoint, pWorldDraw) {
                     var arc = new McDbArc();
                     arc.computeArc(_pt8.x, _pt8.y, _pt9.x, _pt9.y, currendPoint.x, currendPoint.y);
+                    var midPoint = _pt9;
+                    if (isCtrl) {
+                      midPoint = arc.center.clone().addvec(arc.center.clone().sub(midPoint));
+                      arc.computeArc(_pt8.x, _pt8.y, midPoint.x, midPoint.y, currendPoint.x, currendPoint.y);
+                    }
                     pWorldDraw.drawMcDbEntity(arc);
                   });
                   _context.next = 452;
@@ -27339,10 +27344,16 @@ function _drawPolyLine() {
                 case 452:
                   _nextPoint = _context.sent;
                   if (!(_nextPoint !== null)) {
-                    _context.next = 458;
+                    _context.next = 460;
                     break;
                   }
-                  retBulge = MxCADUtility.calcBulge(_pt8, _pt9, _nextPoint);
+                  _midPoint4 = _pt9;
+                  if (isCtrl) {
+                    arc = new McDbArc();
+                    arc.computeArc(_pt8.x, _pt8.y, _midPoint4.x, _midPoint4.y, _nextPoint.x, _nextPoint.y);
+                    _midPoint4 = arc.center.clone().addvec(arc.center.clone().sub(_midPoint4));
+                  }
+                  retBulge = MxCADUtility.calcBulge(_pt8, _midPoint4, _nextPoint);
                   if (retBulge.ret) {
                     _nextData11 = {};
                     _nextData11.dStartWidth = dStartWidth;
@@ -27361,58 +27372,58 @@ function _drawPolyLine() {
                   } else {
                     MxFun.acutPrintf(_ML_String("ID_ENDPOINT_INVALID1", "\n \u7AEF\u70B9 *\u65E0\u6548*"));
                   }
-                  _context.next = 459;
+                  _context.next = 461;
                   break;
-                case 458:
+                case 460:
                   return _context.abrupt("return", 0);
-                case 459:
-                  _context.next = 490;
-                  break;
                 case 461:
+                  _context.next = 492;
+                  break;
+                case 463:
                   if (!_getNextPoint.isKeyWordPicked("W")) {
-                    _context.next = 483;
+                    _context.next = 485;
                     break;
                   }
                   _getWidth3 = new MxCADUiPrDist();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u5BBD\u5EA6"));
-                  _context.next = 466;
+                  _context.next = 468;
                   return _getWidth3.go();
-                case 466:
+                case 468:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 469;
+                    _context.next = 471;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 469:
+                case 471:
                   dStartWidth = _getWidth3.value();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u5BBD\u5EA6"));
-                  _context.next = 473;
+                  _context.next = 475;
                   return _getWidth3.go();
-                case 473:
+                case 475:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 476;
+                    _context.next = 478;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 476:
+                case 478:
                   dEndWidth = _getWidth3.value();
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 490;
+                  _context.next = 492;
                   break;
-                case 483:
+                case 485:
                   if (!_getNextPoint.isKeyWordPicked("C")) {
-                    _context.next = 489;
+                    _context.next = 491;
                     break;
                   }
                   vecData[vecData.length - 1].dBulge = CMxDrawPolylineDragArcDraw_CalcArcBulge(userDrawFristData.pt, firstPoint, isCtrl ? vecArcTangent.clone().negate() : vecArcTangent);
                   isClose = true;
                   return _context.abrupt("return", 0);
-                case 489:
+                case 491:
                   if (_getNextPoint.isKeyWordPicked("U")) {
                     if (vecData.length > 1) {
                       vecData.pop();
@@ -27423,12 +27434,12 @@ function _drawPolyLine() {
                       }
                     }
                   }
-                case 490:
-                  _context.next = 493;
-                  break;
                 case 492:
+                  _context.next = 495;
+                  break;
+                case 494:
                   return _context.abrupt("return", 0);
-                case 493:
+                case 495:
                 case "end":
                   return _context.stop();
               }
@@ -38146,6 +38157,9 @@ var Mx3dGeCSYSR = /*#__PURE__*/function (_Mx3dGeObject12) {
     if (!p1) {
       _this28 = _super35.call(this);
       _this28.initTempObject(new MxApp3D.imp.Mx3dGeCSYSR());
+    } else if (p1 instanceof Mx3dGePoint && p2 instanceof Mx3dGeDir && !p3) {
+      _this28 = _super35.call(this);
+      _this28.initTempObject(new MxApp3D.imp.Mx3dGeCSYSR(p1.getImp(), p2.getImp()));
     } else if (p1 instanceof Mx3dGePoint && p2 instanceof Mx3dGeDir && p3 instanceof Mx3dGeDir) {
       _this28 = _super35.call(this);
       _this28.initTempObject(new MxApp3D.imp.Mx3dGeCSYSR(p1.getImp(), p2.getImp(), p3.getImp()));