@yanqirenshi/d3.ter 0.1.1 → 0.1.2

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.
@@ -129,7 +129,7 @@ var Geometry = /*#__PURE__*/function () {
129
129
  value: function getPortLine(port, rect) {
130
130
  // degree,
131
131
  var from = this.getPortLineFrom(rect);
132
- var to = this.getPortLineTo(port.degree, rect);
132
+ var to = this.getPortLineTo(port.degree(), rect);
133
133
  return {
134
134
  from: {
135
135
  x: from.x,
@@ -25,9 +25,211 @@ var Ports = /*#__PURE__*/function () {
25
25
  }
26
26
 
27
27
  _createClass(Ports, [{
28
+ key: "drawLine",
29
+ value:
30
+ /* **************************************************************** *
31
+ * Draw
32
+ * **************************************************************** */
33
+ function drawLine(g) {
34
+ var _this = this;
35
+
36
+ var lines = g.selectAll('line').data(function (d) {
37
+ return d._ports ? d._ports : [];
38
+ }, function (d) {
39
+ return d._id;
40
+ }); // delete
41
+
42
+ lines.exit().remove(); // update
43
+
44
+ lines.each(function (d, i) {
45
+ var line = _this.calLinePoints(d);
46
+
47
+ d.position = line.to;
48
+ d.line = line;
49
+ }).attr("x1", function (d) {
50
+ return d.line.from.x;
51
+ }).attr("y1", function (d) {
52
+ return d.line.from.y;
53
+ }).attr("x2", function (d) {
54
+ return d.line.to.x;
55
+ }).attr("y2", function (d) {
56
+ return d.line.to.y;
57
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2"); // add
58
+
59
+ lines.enter().each(function (d, i) {
60
+ var line = _this.calLinePoints(d);
61
+
62
+ d.position = line.to;
63
+ d.line = line;
64
+ }).append("line").attr("x1", function (d) {
65
+ return d.line.from.x;
66
+ }).attr("y1", function (d) {
67
+ return d.line.from.y;
68
+ }).attr("x2", function (d) {
69
+ return d.line.to.x;
70
+ }).attr("y2", function (d) {
71
+ return d.line.to.y;
72
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2");
73
+ }
74
+ }, {
75
+ key: "drawCardinalityOne",
76
+ value: function drawCardinalityOne(g) {
77
+ var _this2 = this;
78
+
79
+ var filter = function filter() {
80
+ var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
81
+ return ports.filter(function (d) {
82
+ return d.cardinality === 1;
83
+ });
84
+ };
85
+
86
+ var optionalities = g.selectAll('line.cardinality').data(function (d) {
87
+ return filter(d._ports);
88
+ }, function (d) {
89
+ return d._id;
90
+ });
91
+ optionalities.attr("x1", function (d) {
92
+ return d.line_cardinality.from.x;
93
+ }).attr("y1", function (d) {
94
+ return d.line_cardinality.from.y;
95
+ }).attr("x2", function (d) {
96
+ return d.line_cardinality.to.x;
97
+ }).attr("y2", function (d) {
98
+ return d.line_cardinality.to.y;
99
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2");
100
+ optionalities.enter().each(function (d) {
101
+ return d.line_cardinality = _this2.calOneLine(d, 11);
102
+ }).append('line').classed("cardinality", true).attr("x1", function (d) {
103
+ return d.line_cardinality.from.x;
104
+ }).attr("y1", function (d) {
105
+ return d.line_cardinality.from.y;
106
+ }).attr("x2", function (d) {
107
+ return d.line_cardinality.to.x;
108
+ }).attr("y2", function (d) {
109
+ return d.line_cardinality.to.y;
110
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2");
111
+ }
112
+ }, {
113
+ key: "drawCardinalityThree",
114
+ value: function drawCardinalityThree(g) {
115
+ var _this3 = this;
116
+
117
+ var filter = function filter() {
118
+ var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
119
+ return ports.filter(function (d) {
120
+ return d.cardinality === 3;
121
+ });
122
+ };
123
+
124
+ var optionalities = g.selectAll('path.cardinality').data(function (d) {
125
+ return filter(d._ports);
126
+ }, function (d) {
127
+ return d._id;
128
+ });
129
+ var line = d3.line().x(function (d) {
130
+ return d[0];
131
+ }).y(function (d) {
132
+ return d[1];
133
+ });
134
+ optionalities.each(function (d) {
135
+ return d.line_cardinality_three = _this3.calThreeLine(d, 11);
136
+ }).attr('d', function (d) {
137
+ return line(d.line_cardinality_three);
138
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2");
139
+ optionalities.enter().each(function (d) {
140
+ return d.line_cardinality_three = _this3.calThreeLine(d, 11);
141
+ }).append('path').classed("cardinality", true).attr('d', function (d) {
142
+ return line(d.line_cardinality_three);
143
+ }).attr("fill", 'none').attr("stroke-width", 3).attr("stroke", "#a3a3a2");
144
+ }
145
+ }, {
146
+ key: "drawCardinality",
147
+ value: function drawCardinality(g) {
148
+ // E1のインスタンス1つに対応する、E2のインスタンスの最大数
149
+ this.drawCardinalityOne(g);
150
+ this.drawCardinalityThree(g);
151
+ }
152
+ }, {
153
+ key: "drawOptionalityOne",
154
+ value: function drawOptionalityOne(g) {
155
+ var _this4 = this;
156
+
157
+ var filter = function filter() {
158
+ var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
159
+ return ports.filter(function (d) {
160
+ return d.optionality === 1;
161
+ });
162
+ };
163
+
164
+ var optionalities = g.selectAll('line.optionality').data(function (d) {
165
+ return filter(d._ports);
166
+ }, function (d) {
167
+ return d._id;
168
+ });
169
+ optionalities.enter().each(function (d) {
170
+ return d.line_optionality = _this4.calOneLine(d, 22);
171
+ }).append('line').classed("optionality", true).attr("x1", function (d) {
172
+ return d.line_optionality.from.x;
173
+ }).attr("y1", function (d) {
174
+ return d.line_optionality.from.y;
175
+ }).attr("x2", function (d) {
176
+ return d.line_optionality.to.x;
177
+ }).attr("y2", function (d) {
178
+ return d.line_optionality.to.y;
179
+ }).attr("stroke-width", 3).attr("stroke", "#a3a3a2");
180
+ }
181
+ }, {
182
+ key: "drawOptionalityZero",
183
+ value: function drawOptionalityZero(g) {
184
+ var _this5 = this;
185
+
186
+ var filter = function filter() {
187
+ var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
188
+ return ports.filter(function (d) {
189
+ return d.optionality === 0;
190
+ });
191
+ };
192
+
193
+ var optionalities = g.selectAll('circle.optionality').data(function (d) {
194
+ return filter(d._ports);
195
+ }, function (d) {
196
+ return d._id;
197
+ });
198
+ optionalities.each(function (d) {
199
+ return d.line_circle = _this5.calCircle(d);
200
+ }).attr("cx", function (d) {
201
+ return d.line_circle.x;
202
+ }).attr("cy", function (d) {
203
+ return d.line_circle.y;
204
+ }).attr("r", 5).attr("fill", "#fefefe").attr("stroke-width", 3).attr("stroke", "#a3a3a2");
205
+ optionalities.enter().each(function (d) {
206
+ return d.line_circle = _this5.calCircle(d);
207
+ }).append("circle").classed("optionality", true).attr("cx", function (d) {
208
+ return d.line_circle.x;
209
+ }).attr("cy", function (d) {
210
+ return d.line_circle.y;
211
+ }).attr("r", 5).attr("fill", "#fefefe").attr("stroke-width", 3).attr("stroke", "#a3a3a2");
212
+ }
213
+ }, {
214
+ key: "drawOptionality",
215
+ value: function drawOptionality(g) {
216
+ // E1のインスタンス1つに対応する、E2のインスタンスの最小数
217
+ this.drawOptionalityOne(g);
218
+ this.drawOptionalityZero(g);
219
+ } // draw (g) {
220
+ // this.drawLine(g);
221
+ // this.drawCardinality(g);
222
+ // this.drawOptionality(g);
223
+ // }
224
+
225
+ /* **************************************************************** *
226
+ * Old
227
+ * **************************************************************** */
228
+ // protected
229
+
230
+ }, {
28
231
  key: "drawPortsCore",
29
- value: // protected
30
- function drawPortsCore(ports) {
232
+ value: function drawPortsCore(ports) {
31
233
  ports.attr('class', 'entity-port').attr('cx', function (d) {
32
234
  return d.position.x;
33
235
  }).attr('cy', function (d) {
package/dist/js/Port.js CHANGED
@@ -60,12 +60,17 @@ var Port = /*#__PURE__*/function (_Atman) {
60
60
  _this.geometry = new _Geometry["default"]();
61
61
  return _this;
62
62
  }
63
- /* **************************************************************** *
64
- * Data manegement
65
- * **************************************************************** */
66
-
67
63
 
68
64
  _createClass(Port, [{
65
+ key: "degree",
66
+ value: function degree() {
67
+ return this._core.position || 0;
68
+ }
69
+ /* **************************************************************** *
70
+ * Data manegement
71
+ * **************************************************************** */
72
+
73
+ }, {
69
74
  key: "calLinePoints",
70
75
  value: function calLinePoints(port) {
71
76
  var table = port._column_instance._table;
@@ -262,7 +267,7 @@ var Port = /*#__PURE__*/function (_Atman) {
262
267
  key: "addPort2Entity",
263
268
  value:
264
269
  /* **************************************************************** *
265
- *
270
+ *
266
271
  * **************************************************************** */
267
272
  function addPort2Entity(entity) {
268
273
  var port = this;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yanqirenshi/d3.ter",
3
- "version": "0.1.1",
3
+ "version": "0.1.2",
4
4
  "author": "yanqirenshi@gmail.com",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "description": "See `src/index.html`",