mxcad 1.0.386 → 1.0.388

package/dist/mxcad.d.ts

@@ -1,6 +1,6 @@
 // Generated by dts-bundle-generator v6.13.0
 
-import { AcquirePointOsnapMode, AcquirePointType, DetailedResult, DynamicInputType, McEdGetPointWorldDrawObject, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MxCursorType, MxDbEntity, MxDrawObject } from 'mxdraw';
+import { AcquirePointOsnapMode, AcquirePointType, DetailedResult, DynamicInputType, McEdGetPointWorldDrawObject, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MxCursorType, MxDbEntity, MxDrawObject, OsModeExParam } from 'mxdraw';
 
 /**
  * 表示一个 Rx 对象的基类。
@@ -997,7 +997,13 @@ export declare class McGeVector3d {
 	 * const angle = vec1.angleTo2(McGeVector3d.kXAxis, McGeVector3d.kNegateZAxis);
 	 * ```
 	 * */
-	angleTo2(vec: McGeVector3d, refVec?: McGeVector3d): number;
+	angleTo2(vec?: McGeVector3d, refVec?: McGeVector3d): number;
+	/** 计算向量在[0, 2*Pi]范围内与X轴的夹角度
+	* @example
+	* ```ts
+	* ```
+	* */
+	angle(): number;
 	/**
 	 * 向量归一化操作
 	 * @return 三维向量对象
@@ -3364,6 +3370,10 @@ export declare class MxCADUiPrBase {
 	 * ```
 	 */
 	setDisableOsnap(isDisable: boolean): void;
+	/**
+	* 设置捕捉时的扩展捕捉参数。
+	*/
+	setOsModeExParam(lVal: OsModeExParam): void;
 	/**
 	 * 是否禁用捕捉
 	 * @example
@@ -8297,6 +8307,11 @@ export declare class McDbHatch extends McDbEntity {
 	 * 对当前定义的填充图案数据进行缩放。
 	 */
 	scalePattern(scale: number): boolean;
+	/**
+	 *通过当前的图案比例，图案定义，角度数据，重新计算图案定义数据。
+	 *计算后，图案比例，角度属性已经计算到图案定义数据中，图案比例，角度属性被重置为0，图案比例被重置为1.
+	 */
+	computePatternDefinition(): boolean;
 }
 /**
  * 代理实体类型，是一种特殊类型的实体，其几何形状和属性信息存储在外部源中，例如外部文件或数据库。
@@ -12994,18 +13009,44 @@ export declare class McObject {
 	* @param call 回调函数
 	* @example
 	* ```ts
-	 import { MxCpp, McObject } from "mxcad"
-	 const mxcad: McObject = MxCpp.getCurrentMxCAD()
-	 mxcad.loadImage(imagUrl, (image) => {
-	   if (!image) {
-		   console.log("loadImage failed");
-		   return;
-	   }
-	   let width = mxcad.mxdraw.viewCoordLong2Cad(100);
-	   let height = (image.height / image.width) * width;
-	   idImage = mxcad.drawImage((pt as any).x, (pt as any).y, width, height, 0, imagUrl,true);
-	   mxcad.updateDisplay();
-	});
+		import { MxCpp } from "mxcad";
+		function selectLocalFile() {
+			return new Promise((resolve) => {
+				const input = document.createElement("input");
+				input.type = "file";
+				input.accept = "image/*";
+				input.onchange = (e) => resolve(e.target.files[0]);
+				input.click();
+			});
+		}
+		function fileToBase64(file) {
+			return new Promise((resolve, reject) => {
+				const reader = new FileReader();
+				reader.onload = () => resolve(reader.result);
+				reader.onerror = reject;
+				reader.readAsDataURL(file);
+			});
+		}
+
+		const file = await selectLocalFile();
+		if (!file) return;
+		const imagData = await fileToBase64(file);
+		let mxcad = MxCpp.getCurrentMxCAD();
+
+		mxcad.loadImageBase64(imagData, "test.jpg", (image) => {
+			if (!image) {
+				console.log("loadImage failed");
+				return;
+			}
+			let width = mxcad.mxdraw.viewCoordLong2Cad(100);
+			let height = (image.height / image.width) * width;
+
+			let viewAngle = 0.0;
+			let id = mxcad.drawImage(100, 100, width, height, viewAngle, "test.jpg", true, image.width, image.height,"",imagData);
+
+
+			mxcad.updateDisplay();
+		})
 	* ```
 	*/
 	loadImageBase64(sImageBase64: string, imageFileName: string, call: (image: any) => void): void;
@@ -13018,7 +13059,7 @@ export declare class McObject {
 	 * @param dAng 图片角度,单位是度
 	 * @param imageUrl 图片路径
 	 */
-	drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number, imageName: string, isConvertBase64?: boolean, dwgImageSizeWidth?: number, dwgImageSizeHeight?: number, imageUrl?: string): McObjectId;
+	drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number, imageName: string, isConvertBase64?: boolean, dwgImageSizeWidth?: number, dwgImageSizeHeight?: number, imageUrl?: string, sImageBase64?: string): McObjectId;
 	/**
 	 * 添加一个图片定义到cad数据库中 。
 	 * @param imageUrl 图片路径
@@ -13038,7 +13079,7 @@ export declare class McObject {
 		});
 	 * ```
 	 */
-	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string): McObjectId;
+	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string, sBase64Data?: string): McObjectId;
 	/**
 	 * 显示线重
 	*/

package/dist/mxcad.es.js

@@ -1,4 +1,4 @@
-import { MxFun, DetailedResult, MrxDbgUiPrPoint, MrxDbgUiPrDist, MrxDbgUiPrAngle, MrxDbgUiPrInt, MrxDbgUiPrKeyWord, MrxDbgUiPrString, DynamicInputType, MxCursorType, MrxDbgUtils, MxType, MxDrawObject, store, loadCoreCode, MrxDbgUiPrBaseReturn } from 'mxdraw';
+import { MxFun, DetailedResult, MrxDbgUiPrPoint, MrxDbgUiPrDist, MrxDbgUiPrAngle, MrxDbgUiPrInt, MrxDbgUiPrKeyWord, MrxDbgUiPrString, DynamicInputType, MxCursorType, MrxDbgUtils, MxType, MxDrawObject, store, loadCoreCode, MrxDbgUiPrBaseReturn, OsModeExParam } from 'mxdraw';
 
 function getAugmentedNamespace(n) {
   var f = n.default;
@@ -14596,7 +14596,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.385";
+const version$1 = "1.0.387";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -16598,6 +16598,11 @@ var MxCADUiPrBase = /*#__PURE__*/function () {
     value: function setDisableOsnap(isDisable) {
       this.imp.setDisableOsnap(isDisable);
     }
+  }, {
+    key: "setOsModeExParam",
+    value: function setOsModeExParam(lVal) {
+      this.imp.setOsModeExParam(lVal);
+    }
   }, {
     key: "isDisableOsnap",
     value: function isDisableOsnap() {
@@ -18955,6 +18960,11 @@ var McDbHatch$1 = /*#__PURE__*/function (_McDbEntity7) {
     value: function scalePattern(scale) {
       return this.imp.scalePattern(scale);
     }
+  }, {
+    key: "computePatternDefinition",
+    value: function computePatternDefinition() {
+      return this.imp.computePatternDefinition();
+    }
   }]);
   return McDbHatch;
 }(McDbEntity);
@@ -23019,7 +23029,8 @@ var McObject = /*#__PURE__*/function () {
       var dwgImageSizeWidth = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
       var dwgImageSizeHeight = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
       var imageUrl = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : "";
-      return new McObjectId(this.imp.DrawImage(dPosX, dPosY, dWidth, dHeight, dAng, MxG2312Obj.encodeToGb2312(imageName), isConvertBase64, dwgImageSizeWidth, dwgImageSizeHeight, MxG2312Obj.encodeToGb2312(imageUrl)));
+      var sImageBase64 = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : "";
+      return new McObjectId(this.imp.DrawImage(dPosX, dPosY, dWidth, dHeight, dAng, MxG2312Obj.encodeToGb2312(imageName), isConvertBase64, dwgImageSizeWidth, dwgImageSizeHeight, MxG2312Obj.encodeToGb2312(imageUrl), sImageBase64));
     }
   }, {
     key: "addImageDefine",
@@ -23027,7 +23038,8 @@ var McObject = /*#__PURE__*/function () {
       var sName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
       var isConvertBase64 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var sourceFileName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "";
-      return new McObjectId(this.imp.addImageDefine(MxG2312Obj.encodeToGb2312(imageUrl), MxG2312Obj.encodeToGb2312(sName), isConvertBase64, MxG2312Obj.encodeToGb2312(sourceFileName)));
+      var sBase64Data = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
+      return new McObjectId(this.imp.addImageDefine(MxG2312Obj.encodeToGb2312(imageUrl), MxG2312Obj.encodeToGb2312(sName), isConvertBase64, MxG2312Obj.encodeToGb2312(sourceFileName), sBase64Data));
     }
   }, {
     key: "showLineWeight",
@@ -24670,9 +24682,15 @@ var McGeVector3d = /*#__PURE__*/function () {
   }, {
     key: "angleTo2",
     value: function angleTo2(vec, refVec) {
+      if (!vec) vec = McGeVector3d.kXAxis;
       if (!refVec) refVec = McGeVector3d.kNegateZAxis;
       return this.imp.angleTo(vec.imp, refVec.imp);
     }
+  }, {
+    key: "angle",
+    value: function angle() {
+      return this.imp.angleTo(McGeVector3d.kXAxis.imp, McGeVector3d.kNegateZAxis.imp);
+    }
   }, {
     key: "normalize",
     value: function normalize() {
@@ -37351,7 +37369,7 @@ function _drawCircle() {
                     drawMethod = "default";
                   }
                   if (!(drawMethod === "default")) {
-                    _context.next = 47;
+                    _context.next = 48;
                     break;
                   }
                   if (center) {
@@ -37395,7 +37413,7 @@ function _drawCircle() {
                   center = point;
                 case 19:
                   if (radius) {
-                    _context.next = 44;
+                    _context.next = 45;
                     break;
                   }
                   getDist = new MxCADUiPrDist();
@@ -37411,12 +37429,13 @@ function _drawCircle() {
                     pWorldDraw.drawMcDbEntity(circle2, true);
                     pWorldDraw.drawLine(circle2.center.toVector3(), currentPoint.toVector3());
                   });
-                  _context.next = 27;
+                  getDist.setOsModeExParam(OsModeExParam.kCircleTangentOsmode);
+                  _context.next = 28;
                   return getDist.go();
-                case 27:
+                case 28:
                   _radius = _context.sent;
                   if (!getDist.isKeyWordPicked("D")) {
-                    _context.next = 40;
+                    _context.next = 41;
                     break;
                   }
                   isRadius = false;
@@ -37424,64 +37443,64 @@ function _drawCircle() {
                   getDist.setBasePt(center);
                   getDist.setMessage(_ML_String("McDbCircle_Diameter", "\u6307\u5B9A\u5706\u7684\u76F4\u5F84"));
                   getDist.setKeyWords("");
-                  _context.next = 36;
+                  _context.next = 37;
                   return getDist.go();
-                case 36:
+                case 37:
                   diameter = _context.sent;
                   if (diameter) {
-                    _context.next = 39;
+                    _context.next = 40;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 39:
-                  radius = diameter / 2;
                 case 40:
+                  radius = diameter / 2;
+                case 41:
                   if (radius) {
-                    _context.next = 44;
+                    _context.next = 45;
                     break;
                   }
                   if (_radius) {
-                    _context.next = 43;
+                    _context.next = 44;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 43:
-                  radius = _radius;
                 case 44:
+                  radius = _radius;
+                case 45:
                   circle.center = center;
                   circle.radius = radius;
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(circle, true)
                   });
-                case 47:
+                case 48:
                   if (!(drawMethod === "3P")) {
-                    _context.next = 77;
+                    _context.next = 78;
                     break;
                   }
                   if (point1) {
-                    _context.next = 56;
+                    _context.next = 57;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E00\u4E2A\u70B9");
                   getPoint.setKeyWords("");
-                  _context.next = 53;
+                  _context.next = 54;
                   return getPoint.go();
-                case 53:
+                case 54:
                   point1 = _context.sent;
                   if (point1) {
-                    _context.next = 56;
+                    _context.next = 57;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 56:
+                case 57:
                   if (point2) {
-                    _context.next = 65;
+                    _context.next = 66;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E8C\u4E2A\u70B9");
@@ -37490,20 +37509,20 @@ function _drawCircle() {
                     if (!point1) return;
                     pw.drawLine(point1.toVector3(), pt.toVector3());
                   });
-                  _context.next = 62;
+                  _context.next = 63;
                   return getPoint.go();
-                case 62:
+                case 63:
                   point2 = _context.sent;
                   if (point2) {
-                    _context.next = 65;
+                    _context.next = 66;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 65:
+                case 66:
                   if (point3) {
-                    _context.next = 74;
+                    _context.next = 75;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E09\u4E2A\u70B9");
@@ -37517,48 +37536,48 @@ function _drawCircle() {
                       pw.drawMcDbEntity(circle3, true);
                     }
                   });
-                  _context.next = 71;
+                  _context.next = 72;
                   return getPoint.go();
-                case 71:
+                case 72:
                   point3 = _context.sent;
                   if (point3) {
-                    _context.next = 74;
+                    _context.next = 75;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 74:
+                case 75:
                   center2 = threePointsToDetermineTheCenterOfTheCircle([point1, point2, point3]);
                   circle2 = new McDbCircle(center2.x, center2.y, center2.z, center2.distanceTo(point1));
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(circle2, true)
                   });
-                case 77:
+                case 78:
                   if (!(drawMethod === "2P")) {
-                    _context.next = 98;
+                    _context.next = 99;
                     break;
                   }
                   if (endPoint1) {
-                    _context.next = 86;
+                    _context.next = 87;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E00\u4E2A\u7AEF\u70B9");
                   getPoint.setKeyWords("");
-                  _context.next = 83;
+                  _context.next = 84;
                   return getPoint.go();
-                case 83:
+                case 84:
                   endPoint1 = _context.sent;
                   if (endPoint1) {
-                    _context.next = 86;
+                    _context.next = 87;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 86:
+                case 87:
                   if (endPoint2) {
-                    _context.next = 95;
+                    _context.next = 96;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E8C\u4E2A\u7AEF\u70B9");
@@ -37569,97 +37588,97 @@ function _drawCircle() {
                     radius = center.distanceTo(endPoint1);
                     pw.drawMcDbEntity(new McDbCircle(center.x, center.y, center.z, radius), true);
                   });
-                  _context.next = 92;
+                  _context.next = 93;
                   return getPoint.go();
-                case 92:
+                case 93:
                   endPoint2 = _context.sent;
                   if (endPoint2) {
-                    _context.next = 95;
+                    _context.next = 96;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 95:
+                case 96:
                   center = new McGePoint3d((endPoint2.x + endPoint1.x) / 2, (endPoint2.y + endPoint1.y) / 2, (endPoint2.z + endPoint1.z) / 2);
                   radius = center.distanceTo(endPoint1);
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(new McDbCircle(center.x, center.y, center.z, radius), true)
                   });
-                case 98:
+                case 99:
                   if (!(drawMethod === "T")) {
-                    _context.next = 156;
+                    _context.next = 157;
                     break;
                   }
                   getPoint.setMessage("\u6307\u5B9A\u5BF9\u8C61\u4E0E\u5706\u7684\u7B2C\u4E00\u4E2A\u5207\u70B9");
                   getPoint.setKeyWords("");
-                  _context.next = 103;
+                  _context.next = 104;
                   return getPoint.go();
-                case 103:
+                case 104:
                   pt1 = _context.sent;
                   if (pt1) {
-                    _context.next = 106;
+                    _context.next = 107;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 106:
+                case 107:
                   entId1 = MxCADUtility.findEntAtPoint(pt1.x, pt1.y, pt1.z, -1, resbuf);
                   ent1 = entId1.getMcDbCurve();
                   if (ent1) {
-                    _context.next = 110;
+                    _context.next = 111;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 110:
+                case 111:
                   getPoint.setMessage("\u6307\u5B9A\u5BF9\u8C61\u4E0E\u5706\u7684\u7B2C\u4E8C\u4E2A\u5207\u70B9");
                   getPoint.clearLastInputPoint();
-                  _context.next = 114;
+                  _context.next = 115;
                   return getPoint.go();
-                case 114:
+                case 115:
                   pt2 = _context.sent;
                   if (pt2) {
-                    _context.next = 117;
+                    _context.next = 118;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 117:
+                case 118:
                   entId2 = MxCADUtility.findEntAtPoint(pt2.x, pt2.y, pt2.z, -1, resbuf);
                   ent2 = entId2.getMcDbCurve();
                   if (ent2) {
-                    _context.next = 121;
+                    _context.next = 122;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 121:
+                case 122:
                   _getDist = new MxCADUiPrDist();
                   _getDist.setMessage("\u6307\u5B9A\u5706\u7684\u534A\u5F84");
-                  _context.next = 125;
+                  _context.next = 126;
                   return _getDist.go();
-                case 125:
+                case 126:
                   radius2 = _context.sent;
                   if (radius2) {
-                    _context.next = 128;
+                    _context.next = 129;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 128:
+                case 129:
                   centers = findTangentCircles(ent1, ent2, radius2, pt1, pt2);
                   if (!(!centers || centers.length === 0)) {
-                    _context.next = 131;
+                    _context.next = 132;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 131:
+                case 132:
                   if (!(centers.length === 1)) {
-                    _context.next = 137;
+                    _context.next = 138;
                     break;
                   }
                   _centers = _slicedToArray$1(centers, 1), _center = _centers[0];
@@ -37667,7 +37686,7 @@ function _drawCircle() {
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(_circle)
                   });
-                case 137:
+                case 138:
                   getPoint2 = new MxCADUiPrPoint();
                   getPoint2.clearLastInputPoint();
                   getPoint2.setMessage("\u8BF7\u9009\u62E9\u4F7F\u7528\u54EA\u4E2A\u5706\u5FC3");
@@ -37683,20 +37702,20 @@ function _drawCircle() {
                     var center2 = getCenter(pt3);
                     pw.drawCircle(center2.toVector3(), radius2);
                   });
-                  _context.next = 144;
+                  _context.next = 145;
                   return getPoint2.go();
-                case 144:
+                case 145:
                   pt = _context.sent;
                   if (!(getPoint2.getStatus() === MrxDbgUiPrBaseReturn.kCancel)) {
-                    _context.next = 147;
+                    _context.next = 148;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 147:
+                case 148:
                   if (pt) {
-                    _context.next = 153;
+                    _context.next = 154;
                     break;
                   }
                   _centers2 = _slicedToArray$1(centers, 1), _center2 = _centers2[0];
@@ -37704,13 +37723,13 @@ function _drawCircle() {
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(_circle2)
                   });
-                case 153:
+                case 154:
                   _center3 = getCenter(pt);
                   _circle3 = new McDbCircle(_center3.x, _center3.y, _center3.z, radius2);
                   return _context.abrupt("return", {
                     v: MxCpp.getCurrentMxCAD().drawEntity(_circle3)
                   });
-                case 156:
+                case 157:
                 case "end":
                   return _context.stop();
               }