@modular-circuit/transpiler 0.0.102 → 0.0.104

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.
Files changed (3) hide show
  1. package/build/converter/netlist_to_kicad/layout.d.ts.map +1 -1
  2. package/build/converter/netlist_to_kicad/layout.js +10 -4
  3. package/package.json +3 -3
package/build/converter/netlist_to_kicad/layout.d.ts.map CHANGED
@@ -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;AAelC,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;AAErC,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;CACvB;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;IA8CrB,OAAO,CAAC,eAAe;CAiCxB"}
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;AAiBlC,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;AAErC,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;CACvB;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;CAiCxB"}
package/build/converter/netlist_to_kicad/layout.js CHANGED
@@ -69,7 +69,8 @@ export var FONT_SIZE = GRID_SIZE;
69
69
  var POWER_START_Y = 30 * GRID_SIZE;
70
70
  var POWER_START_X = (PAPER_SIZE.A4.height - 30) * GRID_SIZE;
71
71
  var POWER_Y_STEP = 16 * GRID_SIZE;
72
- var NODE_NODE_SPACE = 18 * GRID_SIZE;
72
+ var BLOCK_V_SPACE = 8 * GRID_SIZE;
73
+ var BLOCK_H_SPACE = 14 * GRID_SIZE - BLOCK_V_SPACE;
73
74
  var PADDING = 6 * GRID_SIZE;
74
75
  var PADDING_LEFT = 30 * GRID_SIZE;
75
76
  var PADDING_TOP = 21 * GRID_SIZE;
@@ -102,9 +103,14 @@ var Layout = /** @class */ (function () {
102
103
  id: 'root',
103
104
  layoutOptions: {
104
105
  "elk.algorithm": "rectpacking",
105
- "elk.contentAlignment": "H_CENTER | V_CENTER",
106
+ "elk.contentAlignment": "V_TOP | H_LEFT",
106
107
  "elk.rectpacking.orderBySize": "true",
107
- 'elk.spacing.nodeNode': "".concat(NODE_NODE_SPACE),
108
+ "elk.nodeSize.fixedGraphSize": "true",
109
+ "org.eclipse.elk.rectpacking.packing.compaction.rowHeightReevaluation": "true",
110
+ "elk.rectpacking.widthApproximation.optimizationGoal": "ASPECT_RATIO_DRIVEN ",
111
+ "org.eclipse.elk.rectpacking.packing.compaction.iterations": "5",
112
+ "org.eclipse.elk.aspectRatio": "1.414",
113
+ 'elk.spacing.nodeNode': "".concat(BLOCK_V_SPACE),
108
114
  'elk.padding': "[top=".concat(PADDING_TOP, ",left=").concat(PADDING_LEFT, ",bottom=").concat(PADDING, ",right=").concat(PADDING, "]"),
109
115
  'elk.childAreaWidth': "".concat(PAPER_SIZE.A4.width),
110
116
  'elk.childAreaHeight': "".concat(PAPER_SIZE.A4.height),
@@ -169,7 +175,7 @@ var Layout = /** @class */ (function () {
169
175
  factor.outer.l_side +
170
176
  factor.outer.r_side +
171
177
  // | txt | | txt |
172
- WIRE_PADDING * 4);
178
+ WIRE_PADDING * 4) + BLOCK_H_SPACE;
173
179
  var size = {
174
180
  x: block_width,
175
181
  y: block_height,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@modular-circuit/transpiler",
3
- "version": "0.0.102",
3
+ "version": "0.0.104",
4
4
  "description": "Intermediate representation of the modular circuit",
5
5
  "main": "./build/index.js",
6
6
  "files": [
@@ -28,9 +28,9 @@
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/ir": "0.0.63",
31
+ "@modular-circuit/perc": "0.0.61",
32
32
  "@modular-circuit/utils": "0.0.41",
33
- "@modular-circuit/perc": "0.0.61"
33
+ "@modular-circuit/ir": "0.0.63"
34
34
  },
35
35
  "scripts": {
36
36
  "clean": "rimraf build",