@yanqirenshi/d3.ter 0.1.5 → 0.1.7

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.
package/dist/js/Entity.js CHANGED
@@ -7,16 +7,36 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports["default"] = void 0;
9
9
 
10
- var _EntityTailor2 = _interopRequireDefault(require("./EntityTailor.js"));
10
+ var _Atman2 = _interopRequireDefault(require("./Atman.js"));
11
+
12
+ var _IdentifierInstance = _interopRequireDefault(require("./IdentifierInstance.js"));
13
+
14
+ var _AttributeInstance = _interopRequireDefault(require("./AttributeInstance.js"));
15
+
16
+ var _Geometry = _interopRequireDefault(require("./Geometry.js"));
17
+
18
+ var _Name = _interopRequireDefault(require("./utils/Name.js"));
11
19
 
12
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
21
 
14
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
22
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
15
23
 
16
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
24
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
25
+
26
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
27
+
28
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
29
+
30
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
31
+
32
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
33
 
18
34
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
19
35
 
36
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
37
+
38
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
39
+
20
40
  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
21
41
 
22
42
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
@@ -31,18 +51,30 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
31
51
 
32
52
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
33
53
 
34
- var Entity = /*#__PURE__*/function (_EntityTailor) {
35
- _inherits(Entity, _EntityTailor);
54
+ var Entity = /*#__PURE__*/function (_Atman) {
55
+ _inherits(Entity, _Atman);
36
56
 
37
57
  var _super = _createSuper(Entity);
38
58
 
39
- // extends EntityTailor
40
- function Entity(data) {
59
+ function Entity(data, rectum) {
41
60
  var _this;
42
61
 
43
62
  _classCallCheck(this, Entity);
44
63
 
45
64
  _this = _super.call(this, 'ENTITY', data);
65
+ _this._rectum = rectum;
66
+
67
+ _this.init();
68
+
69
+ _this.name.set(data.name);
70
+
71
+ _this.description.contents = data.description;
72
+ _this.position = _objectSpread({}, data.position);
73
+ _this.size = _objectSpread({}, data.size);
74
+ _this.type.contents = _this.entityTypeContents();
75
+ _this.background = _this.entityBackground();
76
+ _this.geometry = new _Geometry["default"](); // iwasaki
77
+
46
78
  _this._default = {
47
79
  line: {
48
80
  height: 14,
@@ -54,7 +86,568 @@ var Entity = /*#__PURE__*/function (_EntityTailor) {
54
86
  return _this;
55
87
  }
56
88
 
57
- return _createClass(Entity);
58
- }(_EntityTailor2["default"]);
89
+ _createClass(Entity, [{
90
+ key: "rectum",
91
+ value: function rectum() {
92
+ return this._rectum;
93
+ }
94
+ }, {
95
+ key: "style",
96
+ value: function style() {
97
+ return this.rectum().style();
98
+ }
99
+ /* **************************************************************** *
100
+ * Builder
101
+ * **************************************************************** */
102
+
103
+ }, {
104
+ key: "init",
105
+ value: function init() {
106
+ this.padding = 8;
107
+ this.margin = 3;
108
+ this.description = {
109
+ name: ''
110
+ };
111
+ this.description = {
112
+ contents: ''
113
+ };
114
+ this.position = {
115
+ x: 0,
116
+ y: 0,
117
+ z: 0
118
+ };
119
+ this.size = {
120
+ w: 0,
121
+ h: 0
122
+ };
123
+ this.bar = {
124
+ size: {
125
+ horizontal: 3,
126
+ header: 3,
127
+ contents: 3
128
+ }
129
+ };
130
+ this.background = {
131
+ color: ''
132
+ };
133
+ this.name = new _Name["default"]();
134
+ this.type = {
135
+ contents: '??',
136
+ padding: 8,
137
+ position: {
138
+ x: 0,
139
+ y: 0,
140
+ z: 0
141
+ },
142
+ size: {
143
+ w: 0,
144
+ h: 0
145
+ }
146
+ };
147
+ this.identifiers = {
148
+ padding: 0,
149
+ position: {
150
+ x: 0,
151
+ y: 0,
152
+ z: 0
153
+ },
154
+ size: {
155
+ w: null,
156
+ h: null
157
+ },
158
+ items: {
159
+ list: [],
160
+ ht: {}
161
+ }
162
+ };
163
+ this.attributes = {
164
+ padding: 0,
165
+ position: {
166
+ x: 0,
167
+ y: 0,
168
+ z: 0
169
+ },
170
+ size: {
171
+ w: null,
172
+ h: null
173
+ },
174
+ items: {
175
+ list: [],
176
+ ht: {}
177
+ }
178
+ };
179
+ this.ports = {
180
+ items: {
181
+ list: [],
182
+ ht: {}
183
+ }
184
+ };
185
+ }
186
+ /** **************************************************************** *
187
+ *
188
+ * **************************************************************** */
189
+
190
+ }, {
191
+ key: "template",
192
+ value: function template() {
193
+ return {
194
+ _id: null,
195
+ _class: 'ENTITY',
196
+ padding: 11,
197
+ margin: 6,
198
+ description: {
199
+ contents: ''
200
+ },
201
+ position: {
202
+ x: 0,
203
+ y: 0,
204
+ z: 0
205
+ },
206
+ size: {
207
+ w: 0,
208
+ h: 0
209
+ },
210
+ bar: {
211
+ size: {
212
+ header: 11,
213
+ contents: 8
214
+ }
215
+ },
216
+ background: {
217
+ color: ''
218
+ },
219
+ name: {
220
+ padding: 11,
221
+ contents: '',
222
+ position: {
223
+ x: 0,
224
+ y: 0,
225
+ z: 0
226
+ },
227
+ size: {
228
+ h: null,
229
+ w: null
230
+ }
231
+ },
232
+ type: {
233
+ contents: '??',
234
+ padding: 11,
235
+ position: {
236
+ x: 0,
237
+ y: 0,
238
+ z: 0
239
+ },
240
+ size: {
241
+ w: 0,
242
+ h: 0
243
+ }
244
+ },
245
+ identifiers: {
246
+ padding: 8,
247
+ position: {
248
+ x: 0,
249
+ y: 0,
250
+ z: 0
251
+ },
252
+ size: {
253
+ w: null,
254
+ h: null
255
+ },
256
+ items: {
257
+ list: [],
258
+ ht: {}
259
+ }
260
+ },
261
+ attributes: {
262
+ padding: 8,
263
+ position: {
264
+ x: 0,
265
+ y: 0,
266
+ z: 0
267
+ },
268
+ size: {
269
+ w: null,
270
+ h: null
271
+ },
272
+ items: {
273
+ list: [],
274
+ ht: {}
275
+ }
276
+ },
277
+ ports: {
278
+ items: {
279
+ list: [],
280
+ ht: {}
281
+ }
282
+ }
283
+ };
284
+ }
285
+ /** **************************************************************** *
286
+ *
287
+ * **************************************************************** */
288
+
289
+ }, {
290
+ key: "entityTypeContents",
291
+ value: function entityTypeContents() {
292
+ var type = this._core.type;
293
+
294
+ switch (type) {
295
+ case 'RESOURCE':
296
+ return 'Rsc';
297
+
298
+ case 'RESOURCE-SUBSET':
299
+ return 'Rsc';
300
+
301
+ case 'COMPARATIVE':
302
+ return '対象';
303
+
304
+ case 'EVENT':
305
+ return 'Evt';
306
+
307
+ case 'EVENT-SUBSET':
308
+ return 'Evt';
309
+
310
+ default:
311
+ throw new Error(type + " は知らないよ。");
312
+ }
313
+ }
314
+ /** **************************************************************** *
315
+ *
316
+ * **************************************************************** */
317
+
318
+ }, {
319
+ key: "entityBackground",
320
+ value: function entityBackground() {
321
+ var background = {
322
+ "resource": {
323
+ color: '#89c3eb'
324
+ },
325
+ "resource-subset": {
326
+ color: '#a0d8ef'
327
+ },
328
+ "event": {
329
+ color: '#f09199'
330
+ },
331
+ "event-subset": {
332
+ color: '#f6bfbc'
333
+ },
334
+ "comparative": {
335
+ color: '#c8d5bb'
336
+ },
337
+ "correspondence": {
338
+ color: '#f2f2b0'
339
+ },
340
+ "recursion": {
341
+ color: '#dbd0e6'
342
+ }
343
+ };
344
+
345
+ var key = this._core.type.toLowerCase();
346
+
347
+ return background[key];
348
+ }
349
+ /** **************************************************************** *
350
+ *
351
+ * **************************************************************** */
352
+
353
+ }, {
354
+ key: "buildIdentifiers",
355
+ value: function buildIdentifiers(state) {
356
+ var out = {
357
+ list: [],
358
+ ht: {}
359
+ };
360
+ var masters = state.identifiers.ht;
361
+ var targets = this._core.identifiers;
362
+
363
+ var _iterator = _createForOfIteratorHelper(targets),
364
+ _step;
365
+
366
+ try {
367
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
368
+ var data = _step.value;
369
+ var master = masters[data.identifier];
370
+ var element = new _IdentifierInstance["default"](master, data);
371
+ element._entity = this;
372
+ out.list.push(element);
373
+ out.ht[element._id] = element;
374
+ }
375
+ } catch (err) {
376
+ _iterator.e(err);
377
+ } finally {
378
+ _iterator.f();
379
+ }
380
+
381
+ return {
382
+ contents: out,
383
+ position: {
384
+ x: 0,
385
+ y: 0
386
+ },
387
+ size: {
388
+ w: 0,
389
+ h: 0
390
+ },
391
+ background: {
392
+ color: '#ffffff'
393
+ },
394
+ padding: 11
395
+ };
396
+ }
397
+ /** **************************************************************** *
398
+ *
399
+ * **************************************************************** */
400
+
401
+ }, {
402
+ key: "buildAttributes",
403
+ value: function buildAttributes(state) {
404
+ var out = {
405
+ list: [],
406
+ ht: {}
407
+ };
408
+ var masters = state.attributes.ht;
409
+ var targets = this._core.attributes;
410
+
411
+ var _iterator2 = _createForOfIteratorHelper(targets),
412
+ _step2;
413
+
414
+ try {
415
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
416
+ var attribute = _step2.value;
417
+ var master = masters[attribute.attribute];
418
+ var element = new _AttributeInstance["default"](master, attribute);
419
+ element._entity = this;
420
+ out.list.push(element);
421
+ out.ht[element._id] = element;
422
+ }
423
+ } catch (err) {
424
+ _iterator2.e(err);
425
+ } finally {
426
+ _iterator2.f();
427
+ }
428
+
429
+ return {
430
+ contents: out,
431
+ position: {
432
+ x: 0,
433
+ y: 0
434
+ },
435
+ size: {
436
+ w: 0,
437
+ h: 0
438
+ },
439
+ background: {
440
+ color: '#ffffff'
441
+ },
442
+ padding: 11
443
+ };
444
+ }
445
+ /** **************************************************************** *
446
+ *
447
+ * **************************************************************** */
448
+
449
+ }, {
450
+ key: "build",
451
+ value: function build(state) {
452
+ this.identifiers = this.buildIdentifiers(state);
453
+ this.attributes = this.buildAttributes(state);
454
+ return this;
455
+ }
456
+ /* **************************************************************** *
457
+ * Size
458
+ * **************************************************************** */
459
+
460
+ }, {
461
+ key: "sizingContentsArea",
462
+ value: function sizingContentsArea() {
463
+ var id_h = this.identifiers.size.h;
464
+ var attr_h = this.attributes.size.h;
465
+ if (id_h > attr_h) this.attributes.size.h = id_h;else this.identifiers.size.h = attr_h;
466
+ }
467
+ }, {
468
+ key: "sizingAttributes",
469
+ value: function sizingAttributes() {
470
+ var data = this.attributes;
471
+ var padding = this.padding;
472
+ data.size.w = this.size.w <= 0 ? 0 : (this.size.w - this.padding * 2) / 2 - this.bar.size.contents / 2;
473
+ data.size.h = data.contents.list.length * (this._default.line.height + padding * 2);
474
+ }
475
+ }, {
476
+ key: "sizingIdentifiers",
477
+ value: function sizingIdentifiers() {
478
+ var data = this.identifiers;
479
+ var padding = this.padding;
480
+ data.size.w = this.size.w <= 0 ? 0 : (this.size.w - padding * 2) / 2 - this.bar.size.contents / 2;
481
+ data.size.h = data.contents.list.length * (this._default.line.height + padding * 2);
482
+ }
483
+ }, {
484
+ key: "sizingName",
485
+ value: function sizingName() {
486
+ var data = this.name;
487
+ if (!data.contents) data.contents = '????????';
488
+ data.size.h = this._default.line.height + data.padding * 2;
489
+ var type = this.type;
490
+ data.size.w = this.size.w <= 0 ? 0 : this.size.w - this.padding * 2 - this.bar.size.header - type.size.w;
491
+ }
492
+ }, {
493
+ key: "sizingType",
494
+ value: function sizingType() {
495
+ var data = this.type;
496
+ if (!data.contents) data.contents = '??';
497
+ data.size.h = this._default.line.height + data.padding * 2;
498
+ data.size.w = data.contents.length * this._default.line.font.size;
499
+ }
500
+ }, {
501
+ key: "sizing",
502
+ value: function sizing() {
503
+ this.sizingType();
504
+ this.sizingName();
505
+ this.sizingIdentifiers();
506
+ this.sizingAttributes();
507
+ this.sizingContentsArea();
508
+ var padding = this.padding * 2;
509
+ var header = this.name.size.h;
510
+ var bar = this.bar.size.horizontal;
511
+ var contents = this.attributes.size.h;
512
+ this.size.h = padding + header + bar + contents;
513
+ return this;
514
+ }
515
+ }, {
516
+ key: "reSizing",
517
+ value: function reSizing() {
518
+ var entity = this;
519
+ entity.name.size.w = Math.ceil(entity._max_w.name) + entity.name.padding * 2;
520
+ entity.identifiers.size.w = Math.ceil(entity._max_w.identifier) + entity.identifiers.padding * 2;
521
+ entity.attributes.size.w = Math.ceil(entity._max_w.attribute) + entity.attributes.padding * 2;
522
+ var name_area_w = entity.name.size.w + entity.bar.size.header + entity.type.size.w;
523
+ var contents_area_w = entity.identifiers.size.w + entity.bar.size.contents + entity.attributes.size.w;
524
+ entity.size.w = (contents_area_w > name_area_w ? contents_area_w : name_area_w) + entity.padding * 2; // fix size for attr area
525
+
526
+ if (entity._max_w.attribute === 0 || contents_area_w < name_area_w) {
527
+ entity.attributes.size.w = entity.size.w - entity.padding * 2 - entity.identifiers.size.w - entity.bar.size.contents;
528
+ } // fix size for name area
529
+
530
+
531
+ if (contents_area_w > name_area_w) {
532
+ entity.name.size.w = entity.size.w - entity.padding * 2 - entity.bar.size.header - entity.type.size.w;
533
+ }
534
+
535
+ return this;
536
+ }
537
+ /* **************************************************************** *
538
+ * Position
539
+ * **************************************************************** */
540
+
541
+ }, {
542
+ key: "positioning",
543
+ value: function positioning() {
544
+ this.positioningEntity(this);
545
+ return this;
546
+ }
547
+ }, {
548
+ key: "positioningEntity",
549
+ value: function positioningEntity(entity, entities) {
550
+ this.positioningName();
551
+ this.positioningType();
552
+ this.positioningIdentifiers();
553
+ this.positioningAttributes();
554
+ this.positioningPorts();
555
+ }
556
+ }, {
557
+ key: "positioningName",
558
+ value: function positioningName() {
559
+ var entity = this;
560
+ var d = entity.name;
561
+ d.position.x = entity.padding;
562
+ d.position.y = entity.padding;
563
+ }
564
+ }, {
565
+ key: "positioningType",
566
+ value: function positioningType() {
567
+ var entity = this;
568
+ var d = entity.type;
569
+ var bar = this.bar.size.header;
570
+ d.position.x = entity.padding + entity.name.size.w + bar;
571
+ d.position.y = entity.padding;
572
+ }
573
+ }, {
574
+ key: "positioningColumnItems",
575
+ value: function positioningColumnItems(d) {
576
+ var padding = d.padding;
577
+ var start = d.position.y + padding;
578
+ var line_height = this._default.line.height;
579
+ var num = 0;
580
+
581
+ var _iterator3 = _createForOfIteratorHelper(d.contents.list),
582
+ _step3;
583
+
584
+ try {
585
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
586
+ var item = _step3.value;
587
+ item.position.x = d.position.x + padding;
588
+ var item_h = line_height + item.name.padding * 2;
589
+ item.position.y = start + num * item_h + item.name.padding;
590
+ num++;
591
+ }
592
+ } catch (err) {
593
+ _iterator3.e(err);
594
+ } finally {
595
+ _iterator3.f();
596
+ }
597
+ }
598
+ }, {
599
+ key: "positioningIdentifiers",
600
+ value: function positioningIdentifiers() {
601
+ var entity = this;
602
+ var d = entity.identifiers;
603
+ var bar = this.bar.size.horizontal;
604
+ d.position.x = entity.padding;
605
+ d.position.y = entity.padding + entity.name.size.h + bar;
606
+ this.positioningColumnItems(d);
607
+ }
608
+ }, {
609
+ key: "positioningAttributes",
610
+ value: function positioningAttributes() {
611
+ var entity = this;
612
+ var d = entity.attributes;
613
+ var bar_contents = this.bar.size.contents;
614
+ var bar_horizontal = this.bar.size.horizontal;
615
+ d.position.x = entity.padding + bar_contents + entity.identifiers.size.w;
616
+ d.position.y = entity.padding + entity.name.size.h + bar_horizontal;
617
+ this.positioningColumnItems(d);
618
+ }
619
+ }, {
620
+ key: "positioningPort",
621
+ value: function positioningPort(port) {
622
+ var entity = this;
623
+ var line_port = this.geometry.getPortLine(port.degree(), entity);
624
+ var lines_entity = this.geometry.getFourSideLines(entity, 4, this.style().entity.margin);
625
+ var point = this.geometry.getCrossPoint(lines_entity, line_port);
626
+ port.position(point.point);
627
+ return port.point;
628
+ }
629
+ }, {
630
+ key: "positioningPorts",
631
+ value: function positioningPorts() {
632
+ var ports = this.ports.items.list;
633
+
634
+ var _iterator4 = _createForOfIteratorHelper(ports),
635
+ _step4;
636
+
637
+ try {
638
+ for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
639
+ var port = _step4.value;
640
+ this.positioningPort(port);
641
+ }
642
+ } catch (err) {
643
+ _iterator4.e(err);
644
+ } finally {
645
+ _iterator4.f();
646
+ }
647
+ }
648
+ }]);
649
+
650
+ return Entity;
651
+ }(_Atman2["default"]);
59
652
 
60
653
  exports["default"] = Entity;
@@ -43,16 +43,14 @@ var Geometry = /*#__PURE__*/function () {
43
43
 
44
44
  }, {
45
45
  key: "getFourSideLines",
46
- value: function getFourSideLines(rect) {
46
+ value: function getFourSideLines(rect, port_r, margin_r) {
47
47
  var x = 0; //rect.position.x;
48
48
 
49
49
  var y = 0; //rect.position.y;
50
50
 
51
51
  var w = rect.size.w;
52
52
  var h = rect.size.h;
53
- var port_r = 4; // let margin = 33 + port_r;
54
-
55
- var margin = 11 + port_r;
53
+ var margin = margin_r + port_r;
56
54
  var top_left = {
57
55
  x: x - margin,
58
56
  y: y - margin
@@ -126,10 +124,10 @@ var Geometry = /*#__PURE__*/function () {
126
124
  }
127
125
  }, {
128
126
  key: "getPortLine",
129
- value: function getPortLine(port, rect) {
127
+ value: function getPortLine(port_degree, rect) {
130
128
  // degree,
131
129
  var from = this.getPortLineFrom(rect);
132
- var to = this.getPortLineTo(port.degree(), rect);
130
+ var to = this.getPortLineTo(port_degree, rect);
133
131
  return {
134
132
  from: {
135
133
  x: from.x,