@mlightcad/data-model 1.3.12 → 1.3.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"AcDbObjectConverter.d.ts","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAEL,iBAAiB,EACjB,eAAe,EAChB,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS;IAqBvD;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,KAAK,EAAE,iBAAiB;IAOxC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,kBAAkB;CAI3B"}
1
+ {"version":3,"file":"AcDbObjectConverter.d.ts","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAEL,iBAAiB,EACjB,eAAe,EAChB,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS;IAwCvD;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,KAAK,EAAE,iBAAiB;IAOxC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,kBAAkB;CAI3B"}
@@ -1,3 +1,4 @@
1
+ import { AcDbBlockTableRecord } from '../database/AcDbBlockTableRecord';
1
2
  import { AcDbLayout, AcDbRasterImageDef } from '../object';
2
3
  /**
3
4
  * Converts DXF objects to AcDbObject instances.
@@ -29,19 +30,37 @@ var AcDbObjectConverter = /** @class */ (function () {
29
30
  * ```
30
31
  */
31
32
  AcDbObjectConverter.prototype.convertLayout = function (layout, model) {
32
- var _a;
33
+ var _a, _b;
33
34
  var dbObject = new AcDbLayout();
34
35
  dbObject.layoutName = layout.layoutName;
35
36
  dbObject.tabOrder = layout.tabOrder;
36
- // layout.paperSpaceTableId doesn't point to the block table record asscicated with
37
- // this layout. So let's get the assocated block table record id from block table.
38
- (_a = model.tables.BLOCK_RECORD) === null || _a === void 0 ? void 0 : _a.entries.some(function (btr) {
39
- if (btr.layoutObjects === layout.handle) {
40
- dbObject.blockTableRecordId = btr.handle;
41
- return true;
37
+ if (layout.ownerObjectId) {
38
+ dbObject.blockTableRecordId = layout.ownerObjectId;
39
+ }
40
+ else {
41
+ (_a = model.tables.BLOCK_RECORD) === null || _a === void 0 ? void 0 : _a.entries.some(function (btr) {
42
+ if (btr.layoutObjects === layout.handle) {
43
+ dbObject.blockTableRecordId = btr.handle;
44
+ return true;
45
+ }
46
+ return false;
47
+ });
48
+ }
49
+ // If the layout is not found in the block table due to some unknow reason,
50
+ // let's set the model space block table record id.
51
+ if (!dbObject.blockTableRecordId) {
52
+ if (layout.layoutName === 'Model') {
53
+ // Upper case model space name
54
+ var modelSpaceName_1 = AcDbBlockTableRecord.MODEL_SPACE_NAME;
55
+ (_b = model.tables.BLOCK_RECORD) === null || _b === void 0 ? void 0 : _b.entries.some(function (btr) {
56
+ if (btr.name.toUpperCase() === modelSpaceName_1) {
57
+ dbObject.blockTableRecordId = btr.handle;
58
+ return true;
59
+ }
60
+ return false;
61
+ });
42
62
  }
43
- return false;
44
- });
63
+ }
45
64
  dbObject.limits.min.copy(layout.minLimit);
46
65
  dbObject.limits.max.copy(layout.maxLimit);
47
66
  dbObject.extents.min.copy(layout.minExtent);
@@ -1 +1 @@
1
- {"version":3,"file":"AcDbObjectConverter.js","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH;IAAA;IAuEA,CAAC;IAtEC;;;;;;;;;;;OAWG;IACH,2CAAa,GAAb,UAAc,MAAuB,EAAE,KAAgB;;QACrD,IAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAA;QACjC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;QACvC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QACnC,mFAAmF;QACnF,kFAAkF;QAClF,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;YACzC,IAAI,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;gBACxC,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;gBACxC,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,6CAAe,GAAf,UAAgB,KAAwB;QACtC,IAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAA;QACzC,QAAQ,CAAC,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAA;QACxC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,gDAAkB,GAA1B,UAA2B,MAAuB,EAAE,QAAoB;QACtE,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QACjC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;IACzC,CAAC;IACH,0BAAC;AAAD,CAAC,AAvED,IAuEC"}
1
+ {"version":3,"file":"AcDbObjectConverter.js","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH;IAAA;IA0FA,CAAC;IAzFC;;;;;;;;;;;OAWG;IACH,2CAAa,GAAb,UAAc,MAAuB,EAAE,KAAgB;;QACrD,IAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAA;QACjC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;QACvC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QACnC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,QAAQ,CAAC,kBAAkB,GAAG,MAAM,CAAC,aAAa,CAAA;QACpD,CAAC;aAAM,CAAC;YACN,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;gBACzC,IAAI,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;oBACxC,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;oBACxC,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,2EAA2E;QAC3E,mDAAmD;QACnD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;gBAClC,8BAA8B;gBAC9B,IAAM,gBAAc,GAAG,oBAAoB,CAAC,gBAAgB,CAAA;gBAC5D,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;oBACzC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,gBAAc,EAAE,CAAC;wBAC9C,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;wBACxC,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,6CAAe,GAAf,UAAgB,KAAwB;QACtC,IAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAA;QACzC,QAAQ,CAAC,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAA;QACxC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,gDAAkB,GAA1B,UAA2B,MAAuB,EAAE,QAAoB;QACtE,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QACjC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;IACzC,CAAC;IACH,0BAAC;AAAD,CAAC,AA1FD,IA0FC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mlightcad/data-model",
3
- "version": "1.3.12",
3
+ "version": "1.3.13",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "repository": {