@mlightcad/data-model 1.7.28 → 1.7.30

package/lib/object/AcDbMlineStyle.js

@@ -13,17 +13,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
+import { AcCmColor } from '@mlightcad/common';
 import { AcDbObject } from '../base/AcDbObject';
 /**
  * Represents the nongraphical MLINESTYLE object.
@@ -35,7 +25,7 @@ var AcDbMlineStyle = /** @class */ (function (_super) {
         _this._styleName = 'STANDARD';
         _this._flags = 0;
         _this._description = '';
-        _this._fillColor = 256;
+        _this._fillColor = new AcCmColor();
         _this._startAngle = 90;
         _this._endAngle = 90;
         _this._elements = [];
@@ -76,7 +66,7 @@ var AcDbMlineStyle = /** @class */ (function (_super) {
             return this._fillColor;
         },
         set: function (value) {
-            this._fillColor = value;
+            this._fillColor.copy(value);
         },
         enumerable: false,
         configurable: true
@@ -116,12 +106,16 @@ var AcDbMlineStyle = /** @class */ (function (_super) {
     });
     Object.defineProperty(AcDbMlineStyle.prototype, "elements", {
         get: function () {
-            return this._elements.map(function (element) { return (__assign({}, element)); });
+            return this._elements.map(function (element) { return ({
+                offset: element.offset,
+                color: element.color.clone(),
+                lineType: element.lineType
+            }); });
         },
         set: function (value) {
             this._elements = value.map(function (element) { return ({
                 offset: element.offset,
-                color: element.color,
+                color: element.color.clone(),
                 lineType: element.lineType
             }); });
         },
@@ -131,7 +125,7 @@ var AcDbMlineStyle = /** @class */ (function (_super) {
     AcDbMlineStyle.prototype.addElement = function (element) {
         this._elements.push({
             offset: element.offset,
-            color: element.color,
+            color: element.color.clone(),
             lineType: element.lineType
         });
     };
@@ -147,13 +141,13 @@ var AcDbMlineStyle = /** @class */ (function (_super) {
         filer.writeString(2, this.styleName);
         filer.writeInt16(70, this.flags);
         filer.writeString(3, this.description);
-        filer.writeInt16(62, this.fillColor);
+        filer.writeCmColor(this.fillColor);
         filer.writeDouble(51, this.startAngle);
         filer.writeDouble(52, this.endAngle);
         filer.writeInt16(71, this.elementCount);
         this._elements.forEach(function (element) {
             filer.writeDouble(49, element.offset);
-            filer.writeInt16(62, element.color);
+            filer.writeCmColor(element.color);
             filer.writeString(6, element.lineType);
         });
         return this;

package/lib/object/AcDbMlineStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcDbMlineStyle.js","sourceRoot":"","sources":["../../src/object/AcDbMlineStyle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcDbMlineStyle.js","sourceRoot":"","sources":["../../src/object/AcDbMlineStyle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAoB/C;;GAEG;AACH;IAAoC,kCAAU;IAS5C;QACE,YAAA,MAAK,WAAE,SAAA;QACP,KAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,KAAI,CAAC,MAAM,GAAG,CAAC,CAAA;QACf,KAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QACtB,KAAI,CAAC,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;QACjC,KAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QACrB,KAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,KAAI,CAAC,SAAS,GAAG,EAAE,CAAA;;IACrB,CAAC;IAED,sBAAI,qCAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAA;QACxB,CAAC;aACD,UAAc,KAAa;YACzB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;QACzB,CAAC;;;OAHA;IAKD,sBAAI,iCAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAA;QACpB,CAAC;aACD,UAAU,KAAa;YACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACrB,CAAC;;;OAHA;IAKD,sBAAI,uCAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAA;QAC1B,CAAC;aACD,UAAgB,KAAa;YAC3B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QAC3B,CAAC;;;OAHA;IAKD,sBAAI,qCAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAA;QACxB,CAAC;aACD,UAAc,KAAgB;YAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,CAAC;;;OAHA;IAQD,sBAAI,sCAAU;QAHd;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,WAAW,CAAA;QACzB,CAAC;aACD,UAAe,KAAa;YAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;QAC1B,CAAC;;;OAHA;IAQD,sBAAI,oCAAQ;QAHZ;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,SAAS,CAAA;QACvB,CAAC;aACD,UAAa,KAAa;YACxB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QACxB,CAAC;;;OAHA;IAKD,sBAAI,wCAAY;aAAhB;YACE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAA;QAC9B,CAAC;;;OAAA;IAED,sBAAI,oCAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAA,OAAO,IAAI,OAAA,CAAC;gBACpC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,EAJmC,CAInC,CAAC,CAAA;QACL,CAAC;aACD,UAAa,KAA8B;YACzC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,UAAA,OAAO,IAAI,OAAA,CAAC;gBACrC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,EAJoC,CAIpC,CAAC,CAAA;QACL,CAAC;;;OAPA;IASD,mCAAU,GAAV,UAAW,OAA8B;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAA;IACJ,CAAC;IAED,wCAAe,GAAf,UAAgB,KAAa;QAC3B,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACvD,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACjC,CAAC;IAEQ,qCAAY,GAArB,UAAsB,KAAmB;QACvC,gBAAK,CAAC,YAAY,YAAC,KAAK,CAAC,CAAA;QACzB,KAAK,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAA;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACpC,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACtC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClC,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACtC,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QACpC,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QACvC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAA,OAAO;YAC5B,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;YACrC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACjC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IACH,qBAAC;AAAD,CAAC,AAvHD,CAAoC,UAAU,GAuH7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlightcad/data-model",
-  "version": "1.7.28",
+  "version": "1.7.30",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -32,12 +32,12 @@
     "require": "./dist/data-model.cjs"
   },
   "dependencies": {
-    "@mlightcad/dxf-json": "^1.1.8",
+    "@mlightcad/dxf-json": "^1.2.0",
     "iconv-lite": "^0.7.0",
     "uid": "^2.0.2",
-    "@mlightcad/graphic-interface": "3.3.28",
-    "@mlightcad/common": "1.4.28",
-    "@mlightcad/geometry-engine": "3.2.28"
+    "@mlightcad/common": "1.4.30",
+    "@mlightcad/graphic-interface": "3.3.30",
+    "@mlightcad/geometry-engine": "3.2.30"
   },
   "scripts": {
     "analyze": "pnpm run analyze:lib && pnpm run analyze:worker",