mxcad 1.0.388 → 1.0.390

package/dist/mxcad.d.ts

@@ -8383,6 +8383,43 @@ export declare class McDbProxyEntity extends McDbEntity {
 }
 /**
  * 光栅图片类，该类用于在CAD中显示光栅图形
+* @example
+* ```ts
+	import { MxCpp, McGePoint3d, McDbRasterImage, McGeVector3d } from "mxcad";
+
+	//画图片
+	function drawImg() {
+	const mxcad = MxCpp.getCurrentMxCAD();
+	// 创建新画布
+	mxcad.newFile();
+	//图片地址
+	let imagUrl = "https://cdn.pixabay.com/photo/2022/11/15/12/23/winter-7593872_960_720.jpg";
+	mxcad.loadImage(imagUrl, (image) => {
+	if (!image) {
+		console.log("loadImage failed");
+		return;
+	}
+	let width = mxcad.mxdraw.viewCoordLong2Cad(100);
+	let height = (image.height / image.width) * width;
+	const id = mxcad.addImageDefine(imagUrl, "winter-7593872_960_720.jpg", true);
+	const img = new McDbRasterImage();
+	img.setImageDefId(id);
+	img.setDwgImageSize(image.width, image.height);
+	const origin = new McGePoint3d(0, 0, 0);
+
+	const uCorner = McGeVector3d.kXAxis.clone();
+	uCorner.mult(width);
+
+	const vOnPlane = McGeVector3d.kYAxis.clone();
+	vOnPlane.mult(height);
+
+	img.setOrientation(origin, uCorner, vOnPlane);
+	mxcad.drawEntity(img);
+	//mxcad.drawImage((pt as any).x, (pt as any).y, width, height, 0, imagUrl,true,image.width,image.height);
+	mxcad.updateDisplay();
+	});
+	};
+* ```
  */
 export declare class McDbRasterImage extends McDbEntity {
 	/**
@@ -8438,12 +8475,10 @@ export declare class McDbRasterImage extends McDbEntity {
 	};
 	/**
 	 * 设置保存dwg文件时，图片的宽高像素。
-	 * ```
 	 */
 	setDwgImageSize(width: number, height: number): boolean;
 	/**
 	 * 返回dwg文件中的图片的宽高像素。
-	 * ```
 	 */
 	getDwgImageSize(): number[];
 	/**
@@ -8461,7 +8496,7 @@ export declare class McDbRasterImage extends McDbEntity {
 	 */
 	setImageDefId(imageId: McObjectId): void;
 	/**
-	 * 获取图像的定义I
+	 * 获取图像的定义ID
 	 * @example
 	 * ```ts
 	 * //假设 rasterImage 为光栅图片实例
@@ -8530,7 +8565,6 @@ export declare class McDbRasterImage extends McDbEntity {
 export declare class McDbWipeout extends McDbEntity {
 	/**
 	* 构造函数。
-	* ```
 	*/
 	constructor(x?: object);
 	/**
@@ -8589,7 +8623,6 @@ export declare class McDbSpline extends McDbCurve {
 	/**
 	 * 得到样条线的数据.
 	 * @example
-	 * ```
 	 */
 	getNurbsData(): {
 		degree: number;
@@ -8605,7 +8638,7 @@ export declare class McDbSpline extends McDbCurve {
 	/**
 	 * 设置样条线的数据.
 	 * @example
-	 * ```
+	 *
 	 */
 	setNurbsData(data: {
 		degree: number;
@@ -8621,7 +8654,6 @@ export declare class McDbSpline extends McDbCurve {
 	/**
 	 * 得到样条线的拟合数据.
 	 * @example
-	 * ```
 	 */
 	getFitPoints(): {
 		degree: number;
@@ -8634,7 +8666,6 @@ export declare class McDbSpline extends McDbCurve {
 	/**
 	 *设置样条线的拟合数据.
 	 * @example
-	 * ```
 	 */
 	setFitPoints(data: {
 		degree: number;
@@ -8651,7 +8682,7 @@ export declare class McDbSpline extends McDbCurve {
  * ```ts
  * ```
  */
-export declare class McDbXline extends McDbEntity {
+export declare class McDbXline extends McDbCurve {
 	/**
 	 * 构造函数。
 	 * @param imp 内部对象。
@@ -8721,7 +8752,7 @@ export declare class McDbXline extends McDbEntity {
  * ```ts
  * ```
  */
-export declare class McDbRay extends McDbEntity {
+export declare class McDbRay extends McDbCurve {
 	/**
 	 * 构造函数。
 	 * @param imp 内部对象。
@@ -16599,6 +16630,7 @@ export declare function postMemoryFile(memoryData: any, url: string, filename: s
 export declare function postEmscriptenIndexedDBFile(filekey: string, url: string, retCall: (code: number, message: string) => void, param?: any): void;
 export declare function createCursor(cursorSize?: number, targetFrameSize?: number, color?: string): any;
 export declare function createMdGeLongLongArrayFormAryId(aryId: McObjectId[]): any;
+export declare function copyMcDbEntityProperties(fromEnt: McDbEntity, toEnt: McDbEntity): void;
 export declare const MxTools: {
 	b64Encode: typeof b64Encode;
 	b64Decode: typeof b64Decode;
@@ -16613,6 +16645,7 @@ export declare const MxTools: {
 	postMemoryFile: typeof postMemoryFile;
 	createCursor: typeof createCursor;
 	createMdGeLongLongArrayFormAryId: typeof createMdGeLongLongArrayFormAryId;
+	copyMcDbEntityProperties: typeof copyMcDbEntityProperties;
 };
 export declare class MxCanvas2Image {
 	private $support;

package/dist/mxcad.es.js

@@ -14596,7 +14596,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.387";
+const version$1 = "1.0.389";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -19256,8 +19256,8 @@ var McDbSpline = /*#__PURE__*/function (_McDbCurve6) {
   }]);
   return McDbSpline;
 }(McDbCurve);
-var McDbXline = /*#__PURE__*/function (_McDbEntity10) {
-  _inherits$1(McDbXline, _McDbEntity10);
+var McDbXline = /*#__PURE__*/function (_McDbCurve7) {
+  _inherits$1(McDbXline, _McDbCurve7);
   var _super25 = _createSuper$9(McDbXline);
   function McDbXline(imp) {
     var _this21;
@@ -19296,9 +19296,9 @@ var McDbXline = /*#__PURE__*/function (_McDbEntity10) {
     }
   }]);
   return McDbXline;
-}(McDbEntity);
-var McDbRay = /*#__PURE__*/function (_McDbEntity11) {
-  _inherits$1(McDbRay, _McDbEntity11);
+}(McDbCurve);
+var McDbRay = /*#__PURE__*/function (_McDbCurve8) {
+  _inherits$1(McDbRay, _McDbCurve8);
   var _super26 = _createSuper$9(McDbRay);
   function McDbRay(imp) {
     var _this22;
@@ -19337,9 +19337,9 @@ var McDbRay = /*#__PURE__*/function (_McDbEntity11) {
     }
   }]);
   return McDbRay;
-}(McDbEntity);
-var McDbMxRegion = /*#__PURE__*/function (_McDbEntity12) {
-  _inherits$1(McDbMxRegion, _McDbEntity12);
+}(McDbCurve);
+var McDbMxRegion = /*#__PURE__*/function (_McDbEntity10) {
+  _inherits$1(McDbMxRegion, _McDbEntity10);
   var _super27 = _createSuper$9(McDbMxRegion);
   function McDbMxRegion(imp) {
     var _this23;
@@ -19417,8 +19417,8 @@ var McDbMxRegion = /*#__PURE__*/function (_McDbEntity12) {
   }]);
   return McDbMxRegion;
 }(McDbEntity);
-var McDbViewport = /*#__PURE__*/function (_McDbEntity13) {
-  _inherits$1(McDbViewport, _McDbEntity13);
+var McDbViewport = /*#__PURE__*/function (_McDbEntity11) {
+  _inherits$1(McDbViewport, _McDbEntity11);
   var _super28 = _createSuper$9(McDbViewport);
   function McDbViewport(x) {
     var _this24;
@@ -41995,7 +41995,8 @@ function _Mx_Offset() {
                                       if (aryObj2.empty()) return;
                                       aryObj2.forEach(function (obj) {
                                         if (obj instanceof McDbEntity) {
-                                          pw.drawMcDbEntity(obj);
+                                          MxTools.copyMcDbEntityProperties(curve2, obj);
+                                          pw.drawMcDbEntity(obj, false, true);
                                         }
                                       });
                                     });
@@ -42095,6 +42096,7 @@ function _Mx_Offset() {
                                         if (!isSourceLayer) {
                                           obj.layer = MxCpp.getCurrentMxCAD().getDatabase().getCurrentlyLayerName();
                                         }
+                                        MxTools.copyMcDbEntityProperties(curve, obj);
                                         var id = MxCpp.getCurrentMxCAD().drawEntity(obj);
                                         if (isMultiple) retIds.unshift(id);
                                       }
@@ -47066,6 +47068,14 @@ function createMdGeLongLongArrayFormAryId(aryId) {
   });
   return ids_imp;
 }
+function copyMcDbEntityProperties(fromEnt, toEnt) {
+  toEnt.layerId = fromEnt.layerId;
+  toEnt.linetypeId = fromEnt.linetypeId;
+  toEnt.linetypeScale = fromEnt.linetypeScale;
+  toEnt.lineweight = fromEnt.lineweight;
+  toEnt.trueColor = fromEnt.trueColor;
+  toEnt.textStyleId = fromEnt.textStyleId;
+}
 var MxTools = {
   b64Encode: b64Encode,
   b64Decode: b64Decode,
@@ -47079,7 +47089,8 @@ var MxTools = {
   postEmscriptenIndexedDBFile: postEmscriptenIndexedDBFile,
   postMemoryFile: postMemoryFile,
   createCursor: createCursor,
-  createMdGeLongLongArrayFormAryId: createMdGeLongLongArrayFormAryId
+  createMdGeLongLongArrayFormAryId: createMdGeLongLongArrayFormAryId,
+  copyMcDbEntityProperties: copyMcDbEntityProperties
 };
 
 var MxCanvas2Image = /*#__PURE__*/function () {
@@ -104214,6 +104225,7 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	postEmscriptenIndexedDBFile,
 	createCursor,
 	createMdGeLongLongArrayFormAryId,
+	copyMcDbEntityProperties,
 	MxTools,
 	MxCanvas2Image,
 	McGePoint3d,
@@ -104353,4 +104365,4 @@ globalThis.Buffer = buffer$1.Buffer;
 globalThis.Buffer.alloc = buffer$1.Buffer.alloc;
 globalThis.Buffer.from = buffer$1.Buffer.from;
 
-export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbViewport, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCooperate, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, crateHexString, createCursor, createMcCmColor, createMdGeLongLongArrayFormAryId, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };
+export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbViewport, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCooperate, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, copyMcDbEntityProperties, crateHexString, createCursor, createMcCmColor, createMdGeLongLongArrayFormAryId, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };