@modular-circuit/transpiler 0.0.106 → 0.0.109
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":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAMvE,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAMvE,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAgBlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAED,eAAO,MAAM,aAAa,QAAgB,CAAA;AAE1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAKhD,eAAO,MAAM,YAAY,QAAY,CAAA;AAIrC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,iBAAiB,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,SAAS,CAAgC;IAEjD,OAAO,CAAC,GAAG,CAAY;IAEhB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAIzC,QAAQ;IAmDrB,OAAO,CAAC,eAAe;CA+BxB"}
|
|
@@ -72,7 +72,6 @@ var POWER_Y_STEP = 16 * GRID_SIZE;
|
|
|
72
72
|
var BLOCK_V_SPACE = 8 * GRID_SIZE;
|
|
73
73
|
var BLOCK_H_SPACE = 14 * GRID_SIZE - BLOCK_V_SPACE;
|
|
74
74
|
var PADDING = 10 * GRID_SIZE;
|
|
75
|
-
var PADDING_LEFT = 30 * GRID_SIZE;
|
|
76
75
|
var PADDING_TOP = 21 * GRID_SIZE;
|
|
77
76
|
export function get_power_pos(pwr_number) {
|
|
78
77
|
return { x: POWER_START_X, y: POWER_START_Y + POWER_Y_STEP * pwr_number };
|
|
@@ -82,6 +81,7 @@ export var BLOCK_PIN_TB_MARGIN = 2 * GRID_SIZE;
|
|
|
82
81
|
var MIN_BLOCK_WIDTH = 8 * GRID_SIZE;
|
|
83
82
|
var INTERNAL_LABEL_MARGIN = 8 * FONT_SIZE;
|
|
84
83
|
export var WIRE_PADDING = GRID_SIZE;
|
|
84
|
+
var SIDE_MARGIN = WIRE_PADDING * 2 + BLOCK_H_SPACE / 2;
|
|
85
85
|
var Layout = /** @class */ (function () {
|
|
86
86
|
function Layout() {
|
|
87
87
|
this.block_geo = {};
|
|
@@ -111,7 +111,7 @@ var Layout = /** @class */ (function () {
|
|
|
111
111
|
'org.eclipse.elk.rectpacking.packing.compaction.iterations': '5',
|
|
112
112
|
'org.eclipse.elk.aspectRatio': '1.414',
|
|
113
113
|
'elk.spacing.nodeNode': "".concat(BLOCK_V_SPACE),
|
|
114
|
-
'elk.padding': "[top=".concat(PADDING_TOP, ",left=").concat(
|
|
114
|
+
'elk.padding': "[top=".concat(PADDING_TOP, ",left=").concat(PADDING, ",bottom=").concat(PADDING, ",right=").concat(PADDING, "]"),
|
|
115
115
|
'elk.childAreaWidth': "".concat(PAPER_SIZE.A4.height),
|
|
116
116
|
'elk.childAreaHeight': "".concat(PAPER_SIZE.A4.width),
|
|
117
117
|
},
|
|
@@ -145,7 +145,7 @@ var Layout = /** @class */ (function () {
|
|
|
145
145
|
child = _e.value;
|
|
146
146
|
geo = this.block_geo[child.id];
|
|
147
147
|
pos = {
|
|
148
|
-
x: (_h = child.x) !== null && _h !== void 0 ? _h : 0,
|
|
148
|
+
x: ((_h = child.x) !== null && _h !== void 0 ? _h : 0) + geo.l_margin,
|
|
149
149
|
y: (_j = child.y) !== null && _j !== void 0 ? _j : 0,
|
|
150
150
|
};
|
|
151
151
|
bbox[child.id] = {
|
|
@@ -170,9 +170,9 @@ var Layout = /** @class */ (function () {
|
|
|
170
170
|
Layout.prototype.calc_block_size = function (factor) {
|
|
171
171
|
var block_height = Math.floor(factor.total_pin_num / 2) * BLOCK_PIN_GAP + 2 * BLOCK_PIN_TB_MARGIN;
|
|
172
172
|
var block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side + factor.internal.r_side + INTERNAL_LABEL_MARGIN);
|
|
173
|
-
var
|
|
174
|
-
|
|
175
|
-
|
|
173
|
+
var l_margin = factor.outer.l_side + SIDE_MARGIN;
|
|
174
|
+
var r_margin = factor.outer.r_side + SIDE_MARGIN;
|
|
175
|
+
var block_bounding_width = block_width + l_margin + r_margin;
|
|
176
176
|
var size = {
|
|
177
177
|
x: block_width,
|
|
178
178
|
y: block_height,
|
|
@@ -184,6 +184,9 @@ var Layout = /** @class */ (function () {
|
|
|
184
184
|
return {
|
|
185
185
|
size: size,
|
|
186
186
|
bounding_size: bounding_size,
|
|
187
|
+
l_margin: l_margin,
|
|
188
|
+
r_margin: r_margin,
|
|
189
|
+
factor: factor,
|
|
187
190
|
};
|
|
188
191
|
};
|
|
189
192
|
return Layout;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modular-circuit/transpiler",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.109",
|
|
4
4
|
"description": "Intermediate representation of the modular circuit",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"files": [
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"js-base64": "^3.7.7",
|
|
29
29
|
"jszip": "^3.10.1",
|
|
30
30
|
"@modular-circuit/electronics-model": "0.0.54",
|
|
31
|
-
"@modular-circuit/utils": "0.0.41",
|
|
32
31
|
"@modular-circuit/perc": "0.0.61",
|
|
32
|
+
"@modular-circuit/utils": "0.0.41",
|
|
33
33
|
"@modular-circuit/ir": "0.0.63"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|