mxcad 1.0.265 → 1.0.266

package/dist/mxcad.d.ts

@@ -10100,6 +10100,14 @@ export declare class McDbDatabase extends McRxObject {
 	 */
 	setCurrentlyTextStyle(sName: string): void;
 	/**
+	* 返回当前使用的线重.
+	*/
+	getCurrentlyLineWeight(): McDb.LineWeight;
+	/**
+	* 设置当前使用的线重.
+	*/
+	setCurrentlyLineWeight(lineWeight: McDb.LineWeight): void;
+	/**
 	* 返回当前文字样式id.
 	*/
 	getCurrentlyTextStyleId(): McObjectId;

package/dist/mxcad.es.js

@@ -14186,7 +14186,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312(hexstr);
 };
 
-const version$1 = "1.0.265";
+const version$1 = "1.0.266";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -19494,6 +19494,16 @@ var McDbDatabase = /*#__PURE__*/function (_McRxObject) {
       var sHex = MxG2312Obj.encodeToGb2312(sName);
       this.imp.SetCurrentlyTextStyle(sHex);
     }
+  }, {
+    key: "getCurrentlyLineWeight",
+    value: function getCurrentlyLineWeight() {
+      return this.imp.GetCurrentlyLineWeight();
+    }
+  }, {
+    key: "setCurrentlyLineWeight",
+    value: function setCurrentlyLineWeight(lineWeight) {
+      return this.imp.SetCurrentlyLineWeight(lineWeight);
+    }
   }, {
     key: "getCurrentlyTextStyleId",
     value: function getCurrentlyTextStyleId() {
@@ -21169,17 +21179,17 @@ var McObject = /*#__PURE__*/function () {
     key: "getCurrentDatabaseDrawColor",
     value: function getCurrentDatabaseDrawColor() {
       var ary = this.getDatabase().getImp().GetCurrentlyDrawColor();
-      var lViewcolor = this.getMxDrawObject().getViewColor();
+      var lWhiteViewColor = this.getMxDrawObject().isWhiteViewColor();
       var r = ary.at(0);
       var g = ary.at(1);
       var b = ary.at(2);
-      if (lViewcolor == 16777215) {
+      if (lWhiteViewColor) {
         if (r == 255 && g == 255 && b == 255) {
           r = 0;
           g = 0;
           b = 0;
         }
-      } else if (lViewcolor == 0) {
+      } else {
         if (r == 0 && g == 0 && b == 0) {
           r = 255;
           g = 255;
@@ -28774,7 +28784,10 @@ function _drawEllipticalArc() {
                   getDist.setKeyWords("");
                   getDist.setBasePt(center);
                   getDist.setUserDraw(function (pt, pw) {
-                    majorAxis = minorAxis = majorAxis.rotateBy(angleTo(center.x, center.y, pt.x, pt.y));
+                    var dx = Math.abs(pt.x - center.x);
+                    var dy = Math.abs(pt.y - center.y);
+                    var ratio = dx / (dx + dy);
+                    radiusRatio = ratio;
                     var ellipseArc = createEllipse();
                     pw.drawMcDbEntity(ellipseArc);
                   });
@@ -28791,7 +28804,7 @@ function _drawEllipticalArc() {
                   });
                 case 60:
                   if (getDist.getDetailedResult() === 8) {
-                    rotation = val2;
+                    radiusRatio = val2;
                   }
                   _context.next = 67;
                   break;
@@ -28815,12 +28828,13 @@ function _drawEllipticalArc() {
                     v: void 0
                   });
                 case 69:
-                  offsetAngle = angleTo(axisEndPoint1.x, axisEndPoint1.y, center.x, center.y);
+                  offsetAngle = Math.atan2(majorAxis.y, majorAxis.x) - Math.PI / 2;
                   getDist.setMessage(_ML_String("McDbEllipse_startAngle", "\u6307\u5B9A\u8D77\u70B9\u89D2\u5EA6"));
                   getDist.setKeyWords("");
                   getDist.setBasePt(center);
                   getDist.setUserDraw(function (pt, pw) {
-                    startAngle = angleTo(center.x, center.y, pt.x, pt.y) - offsetAngle;
+                    var angle = Math.atan2(pt.y - center.y, pt.x - center.x);
+                    startAngle = (angle - offsetAngle + Math.PI * 2) % (Math.PI * 2);
                     var ellipseArc = createEllipse();
                     pw.drawMcDbEntity(ellipseArc);
                   });
@@ -28844,7 +28858,11 @@ function _drawEllipticalArc() {
                   getDist.setMessage(_ML_String("McDbEllipse_endAngle", "\u6307\u5B9A\u7AEF\u70B9\u89D2\u5EA6"));
                   getDist.setKeyWords("[\u5939\u89D2(I)]");
                   getDist.setUserDraw(function (pt, pw) {
-                    endAngle = angleTo(center.x, center.y, pt.x, pt.y) - offsetAngle;
+                    var angle = Math.atan2(pt.y - center.y, pt.x - center.x);
+                    endAngle = (angle - offsetAngle + Math.PI * 2) % (Math.PI * 2);
+                    if (endAngle < startAngle) {
+                      endAngle += Math.PI * 2;
+                    }
                     var ellipseArc = createEllipse();
                     pw.drawMcDbEntity(ellipseArc);
                   });
@@ -28948,7 +28966,7 @@ function _drawMxDbEllipse() {
             return ellipse;
           };
           _loop2 = /*#__PURE__*/regenerator.mark(function _loop2() {
-            var isGetAngle, isGetCenter, isDrawCenterArc, point, endPoint, centerPoint, point1, getDist, xRadius, drawEllipse, length, yRadius, angle, val, val1, val2, ellipse2, ellipse;
+            var isGetAngle, isGetCenter, isDrawCenterArc, point, endPoint, centerPoint, point1, getDist, xRadius, drawEllipse, length, yRadius, offsetAngle, val, val1, val2, ellipse2, ellipse;
             return regenerator.wrap(function _loop2$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
@@ -28989,7 +29007,7 @@ function _drawMxDbEllipse() {
                     _context3.next = 27;
                     break;
                   }
-                  getPoint.setMessage("\n\u6307\u5B9A\u692D\u5706\u4E2D\u5FC3\u70B9");
+                  getPoint.setMessage("\n\u6307\u5B9A\u692D\u5706\u4E2D\u5FC3");
                   getPoint.setKeyWords("");
                   _context3.next = 22;
                   return getPoint.go();
@@ -29074,9 +29092,10 @@ function _drawMxDbEllipse() {
                   }
                   getDist.setMessage(_ML_String("EllipticalArc_startAngle", "\u6307\u5B9A\u8D77\u70B9\u89D2\u5EA6"));
                   getDist.setKeyWords("");
-                  angle = angleTo(center.x, center.y, point1.x, point1.y);
+                  offsetAngle = Math.atan2(majorAxis.y, majorAxis.x) - Math.PI / 2;
                   getDist.setUserDraw(function (currentPoint, pWorldDraw) {
-                    startAngle = angleTo(center.x, center.y, currentPoint.x, currentPoint.y) - angle - Math.PI;
+                    var angle = Math.atan2(currentPoint.y - center.y, currentPoint.x - center.x);
+                    startAngle = (angle - offsetAngle + Math.PI * 2) % (Math.PI * 2);
                     drawEllipse(currentPoint, pWorldDraw);
                   });
                   _context3.next = 60;
@@ -29098,7 +29117,11 @@ function _drawMxDbEllipse() {
                   getDist.setMessage(_ML_String("EllipticalArc_endAngle", "\u6307\u5B9A\u7AEF\u70B9\u89D2\u5EA6"));
                   getDist.setKeyWords("[\u5939\u89D2(I)]");
                   getDist.setUserDraw(function (currentPoint, pWorldDraw) {
-                    endAngle = angleTo(center.x, center.y, currentPoint.x, currentPoint.y) - angle - Math.PI;
+                    var angle = Math.atan2(currentPoint.y - center.y, currentPoint.x - center.x);
+                    endAngle = (angle - offsetAngle + Math.PI * 2) % (Math.PI * 2);
+                    if (endAngle < startAngle) {
+                      endAngle += Math.PI * 2;
+                    }
                     drawEllipse(currentPoint, pWorldDraw);
                   });
                   _context3.next = 70;