foosinn/ergogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Outlines rewrite actually done

Browse source
This commit is contained in:
Bán Dénes 2022-01-16 20:36:19 +01:00
parent 4844a044df
commit d6f83232a8
23 changed files with 288 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/cases/cube.yaml
View file

@ -1,16 +1,10 @@
points:
zones:
arst:
columns:
c1:
rows:
r1:
points.zones.matrix: {}
outlines:
exports:
square:
- type: rectangle
size: [5, 5]
square:
- what: rectangle
where: true
size: [5, 5]
cases:
cube:
- name: square
extrude: 5
cube:
- name: square
extrude: 5

72
test/cli/big/reference/outlines/_export.yaml
View file

@ -7,49 +7,39 @@ models:
- 0
- 0
b:
models:
a:
models: {}
paths:
ShapeLine1:
type: line
origin:
- 0
- 0
b:
paths:
ShapeLine1:
type: line
origin:
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 0
- 0
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
origin:
- 0
- 0

72
test/cli/big/reference/outlines/export.yaml
View file

@ -7,49 +7,39 @@ models:
- 0
- 0
b:
models:
a:
models: {}
paths:
ShapeLine1:
type: line
origin:
- 0
- 0
b:
paths:
ShapeLine1:
type: line
origin:
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 0
- 0
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
origin:
- 0
- 0

2
test/cli/big/reference/points/demo.yaml
View file

@ -1,7 +1,7 @@
models:
export:
models:
matrix_col_row:
matrix:
paths:
top:
type: line

10
test/cli/big/reference/points/points.yaml
View file

@ -1,4 +1,4 @@
matrix_col_row:
matrix:
x: 0
'y': 0
r: 0
@ -19,10 +19,10 @@ matrix_col_row:
padding: 19
skip: false
asym: both
name: matrix_col_row
name: matrix
col:
rows: {}
key: {}
name: col
row: row
colrow: col_row
name: default
row: default
colrow: default_default

27
test/cli/big/reference/source/canonical.yaml
View file

@ -2,23 +2,18 @@ units:
a: 28 + u
points:
zones:
matrix:
columns:
col: {}
rows:
row: {}
matrix: null
outlines:
exports:
export:
-
type: keys
side: left
size: 18
_export:
-
type: keys
side: left
size: 18
export:
-
what: rectangle
where: true
size: 18
_export:
-
what: rectangle
where: true
size: 18
cases:
export:
-

16
test/cli/big/reference/source/raw.txt
View file

@ -1,23 +1,21 @@
units:
a: 28 + u
points.zones.matrix:
columns.col: {}
rows.row: {}
outlines.exports:
outlines:
export:
- type: 'keys'
side: 'left'
- what: rectangle
where: true
size: 18
_export:
- type: 'keys'
side: 'left'
- what: rectangle
where: true
size: 18
cases:
export:
- name: 'export'
- name: export
extrude: 1
_export:
- name: 'export'
- name: export
extrude: 1
pcbs:
export: {}

16
test/fixtures/big.yaml vendored
View file

@ -1,23 +1,21 @@
units:
a: 28 + u
points.zones.matrix:
columns.col: {}
rows.row: {}
outlines.exports:
outlines:
export:
- type: 'keys'
side: 'left'
- what: rectangle
where: true
size: 18
_export:
- type: 'keys'
side: 'left'
- what: rectangle
where: true
size: 18
cases:
export:
- name: 'export'
- name: export
extrude: 1
_export:
- name: 'export'
- name: export
extrude: 1
pcbs:
export: {}

6
test/fixtures/medium.yaml vendored
View file

@ -1,9 +1,9 @@
points.zones.matrix:
columns.col: {}
outlines.exports:
outlines:
export:
- type: 'keys'
side: 'left'
- what: rectangle
where: true
size: 18
pcbs:
export: {}

85
test/outlines/affect_mirror.yaml
View file

@ -10,46 +10,45 @@ points:
ref: matrix_only_top
distance: 30
outlines:
exports:
test:
keys:
type: keys
side: both
size: 14
bound: false
rb:
type: rectangle
anchor:
- ref: mirror_matrix_only_bottom
# we do NOT specify `affect: xyr` here
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
rt:
type: rectangle
anchor:
- ref: mirror_matrix_only_top
affect: xyr
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
lb:
type: rectangle
anchor:
- ref: matrix_only_bottom
# again, no `affect: xyr`
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
lt:
type: rectangle
anchor:
- ref: matrix_only_top
affect: xyr
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
test:
keys:
what: rectangle
where: true
size: 14
bound: false
rb:
what: rectangle
where:
- ref: mirror_matrix_only_bottom
# we do NOT specify `affect: xyr` here
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
rt:
what: rectangle
where:
- ref: mirror_matrix_only_top
affect: xyr
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
lb:
what: rectangle
where:
- ref: matrix_only_bottom
# again, no `affect: xyr`
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack
lt:
what: rectangle
where:
- ref: matrix_only_top
affect: xyr
- shift: [-3,-3]
orient: 30
size: [6,6]
operation: stack

23
test/outlines/basic.yaml
View file

@ -10,15 +10,14 @@ points:
key:
bind: [0, 0, 0, 0]
outlines:
exports:
outline:
main:
type: keys
side: left
size: 20
min:
type: keys
side: left
bound: false
size: 14
operation: subtract
outline:
main:
what: rectangle
where: true
size: 20
min:
what: rectangle
where: true
bound: false
size: 14
operation: subtract

41
test/outlines/circles.yaml
View file

@ -3,24 +3,23 @@ points:
matrix: {}
mirror: 20
outlines:
exports:
outline:
main:
type: keys
side: both
size: 20
bound: false
middle_circle:
type: circle
anchor:
ref:
- matrix
- mirror_matrix
radius: 15
outside_circles:
type: circle
anchor:
ref: matrix
shift: [-10, 10]
radius: 5
mirror: true
outline:
main:
what: rectangle
where: true
size: 20
bound: false
middle_circle:
what: circle
where:
ref:
- matrix
- mirror_matrix
radius: 15
outside_circles:
what: circle
where:
ref: matrix
shift: [-10, 10]
radius: 5
mirror: true

17
test/outlines/fillet.yaml
View file

@ -11,12 +11,11 @@ points:
bottom:
top:
outlines:
exports:
base:
- type: keys
side: left
size: cy
fillet:
- type: outline
name: base
fillet: 2
base:
- what: rectangle
where: true
size: cy
fillet:
- what: outline
name: base
fillet: 2

50
test/outlines/gluing.yaml
View file

@ -1,50 +0,0 @@
points:
zones:
matrix:
columns:
left.key.bind: [,10,,]
right.key.bind: [,,,10]
rows:
bottom.key.bind: [10,,,]
top.key.bind: [,,10,]
key:
bind: [0, 0, 0, 0]
rotate: -20
mirror:
ref: matrix_right_top
distance: 30
outlines:
glue:
default:
top:
left:
ref: matrix_right_top
shift: [,sy / 2]
right:
ref: mirror_matrix_right_top
shift: [,sy / 2]
bottom:
left:
ref: matrix_right_bottom
shift: [,sy / -2]
right:
ref: mirror_matrix_right_bottom
shift: [,sy / -2]
exports:
outline:
main:
type: keys
side: both
size: 20
min:
type: keys
side: both
bound: false
size: 14
operation: subtract
optout:
main:
type: keys
side: both
size: 20
glue: false

146
test/outlines/gluing___outlines_optout_dxf.dxf
View file

@ -1,146 +0,0 @@
0
SECTION
2
HEADER
9
$INSUNITS
70
4
0
ENDSEC
0
SECTION
2
TABLES
0
TABLE
2
LTYPE
0
LTYPE
72
65
70
64
2
CONTINUOUS
3
______
73
0
40
0
0
ENDTAB
0
TABLE
2
LAYER
0
ENDTAB
0
ENDSEC
0
SECTION
2
ENTITIES
0
LINE
8
0
10
-12.8171276
20
-5.9767248
11
23.8308846
21
-19.3155103
0
LINE
8
0
10
-12.8171276
20
-5.9767248
11
0.5216579
21
30.6712874
0
LINE
8
0
10
0.5216579
20
30.6712874
11
37.1696701
21
17.3325019
0
LINE
8
0
10
23.8308846
20
-19.3155103
11
37.1696701
21
17.3325019
0
LINE
8
0
10
54.8742004
20
-19.3155103
11
91.5222126
21
-5.9767248
0
LINE
8
0
10
78.1834271
20
30.6712874
11
91.5222126
21
-5.9767248
0
LINE
8
0
10
41.5354149
20
17.3325019
11
78.1834271
21
30.6712874
0
LINE
8
0
10
41.5354149
20
17.3325019
11
54.8742004
21
-19.3155103
0
ENDSEC
0
EOF

518
test/outlines/gluing___outlines_outline_dxf.dxf
View file

@ -1,518 +0,0 @@
0
SECTION
2
HEADER
9
$INSUNITS
70
4
0
ENDSEC
0
SECTION
2
TABLES
0
TABLE
2
LTYPE
0
LTYPE
72
65
70
64
2
CONTINUOUS
3
______
73
0
40
0
0
ENDTAB
0
TABLE
2
LAYER
0
ENDTAB
0
ENDSEC
0
SECTION
2
ENTITIES
0
LINE
8
0
10
-12.8171276
20
-5.9767248
11
39.3525425
21
-24.9649308
0
LINE
8
0
10
-12.8171276
20
-5.9767248
11
0.5216579
21
30.6712874
0
LINE
8
0
10
0.5216579
20
30.6712874
11
39.3525425
21
16.5380017
0
LINE
8
0
10
41.5354149
20
17.3325019
11
78.1834271
21
30.6712874
0
LINE
8
0
10
41.5354149
20
17.3325019
11
39.3525425
21
16.5380017
0
LINE
8
0
10
39.3525425
20
-24.9649308
11
91.5222126
21
-5.9767248
0
LINE
8
0
10
78.1834271
20
30.6712874
11
91.5222126
21
-5.9767248
0
LINE
8
0
10
-8.9719893
20
-4.1837073
11
4.1837073
21
-8.9719893
0
LINE
8
0
10
4.1837073
20
-8.9719893
11
8.9719893
21
4.1837073
0
LINE
8
0
10
8.9719893
20
4.1837073
11
-4.1837073
21
8.9719893
0
LINE
8
0
10
-4.1837073
20
8.9719893
11
-8.9719893
21
-4.1837073
0
LINE
8
0
10
-2.4736066
20
13.6704525
11
10.68209
21
8.8821705
0
LINE
8
0
10
10.68209
20
8.8821705
11
15.470372
21
22.0378671
0
LINE
8
0
10
15.470372
20
22.0378671
11
2.3146754
21
26.8261491
0
LINE
8
0
10
2.3146754
20
26.8261491
11
-2.4736066
21
13.6704525
0
LINE
8
0
10
8.8821705
20
-10.68209
11
22.0378671
21
-15.470372
0
LINE
8
0
10
22.0378671
20
-15.470372
11
26.8261491
21
-2.3146754
0
LINE
8
0
10
26.8261491
20
-2.3146754
11
13.6704525
21
2.4736066
0
LINE
8
0
10
13.6704525
20
2.4736066
11
8.8821705
21
-10.68209
0
LINE
8
0
10
15.3805532
20
7.1720698
11
28.5362498
21
2.3837878
0
LINE
8
0
10
28.5362498
20
2.3837878
11
33.3245318
21
15.5394844
0
LINE
8
0
10
33.3245318
20
15.5394844
11
20.1688352
21
20.3277664
0
LINE
8
0
10
20.1688352
20
20.3277664
11
15.3805532
21
7.1720698
0
LINE
8
0
10
74.5213777
20
-8.9719893
11
87.6770743
21
-4.1837073
0
LINE
8
0
10
87.6770743
20
-4.1837073
11
82.8887923
21
8.9719893
0
LINE
8
0
10
82.8887923
20
8.9719893
11
69.7330957
21
4.1837073
0
LINE
8
0
10
69.7330957
20
4.1837073
11
74.5213777
21
-8.9719893
0
LINE
8
0
10
68.022995
20
8.8821705
11
81.1786916
21
13.6704525
0
LINE
8
0
10
81.1786916
20
13.6704525
11
76.3904096
21
26.8261491
0
LINE
8
0
10
76.3904096
20
26.8261491
11
63.234713
21
22.0378671
0
LINE
8
0
10
63.234713
20
22.0378671
11
68.022995
21
8.8821705
0
LINE
8
0
10
56.6672179
20
-15.470372
11
69.8229145
21
-10.68209
0
LINE
8
0
10
69.8229145
20
-10.68209
11
65.0346325
21
2.4736066
0
LINE
8
0
10
65.0346325
20
2.4736066
11
51.8789359
21
-2.3146754
0
LINE
8
0
10
51.8789359
20
-2.3146754
11
56.6672179
21
-15.470372
0
LINE
8
0
10
50.1688352
20
2.3837878
11
63.3245318
21
7.1720698
0
LINE
8
0
10
63.3245318
20
7.1720698
11
58.5362498
21
20.3277664
0
LINE
8
0
10
58.5362498
20
20.3277664
11
45.3805532
21
15.5394844
0
LINE
8
0
10
45.3805532
20
15.5394844
11
50.1688352
21
2.3837878
0
ENDSEC
0
EOF

47
test/outlines/polygons.yaml
View file

@ -3,27 +3,26 @@ points:
matrix: {}
mirror: 20
outlines:
exports:
outline:
main:
type: keys
side: both
size: 20
bound: false
middle_poly:
type: polygon
points:
- ref:
- matrix
- mirror_matrix
shift: [0, 20]
- shift: [20, -40]
- shift: [-40, 0]
outside_polys:
type: polygon
points:
- ref: matrix
shift: [-10, 15]
- shift: [5, -10]
- shift: [-10, 0]
mirror: true
outline:
main:
what: rectangle
where: true
size: 20
bound: false
middle_poly:
what: polygon
where.ref:
- matrix
- mirror_matrix
points:
- shift: [0, 20]
- shift: [20, -40]
- shift: [-40, 0]
outside_polys:
what: polygon
where.ref: matrix
points:
- shift: [-10, 15]
- shift: [5, -10]
- shift: [-10, 0]
mirror: true

43
test/outlines/rectangles.yaml
View file

@ -3,25 +3,24 @@ points:
matrix: {}
mirror: 20
outlines:
exports:
outline:
main:
type: keys
side: both
size: 20
bound: false
middle_rect:
type: rectangle
anchor:
ref:
- matrix
- mirror_matrix
shift: [0, sy/2]
size: [20, 40]
outside_rects:
type: rectangle
anchor:
ref: matrix
shift: [-10, 10]
size: 10
mirror: true
outline:
main:
what: rectangle
where: true
size: 20
bound: false
middle_rect:
what: rectangle
where:
ref:
- matrix
- mirror_matrix
shift: [0, sy/2]
size: [20, 40]
outside_rects:
what: rectangle
where:
ref: matrix
shift: [-10, 10]
size: 10
mirror: true

19
test/pcbs/mock_footprints.yaml
View file

@ -1,16 +1,9 @@
points:
zones:
matrix:
columns:
one:
rows:
only:
points.zones.matrix:
outlines:
exports:
edge:
- type: keys
side: left
size: [u, u]
edge:
- what: rectangle
where: true
size: u
pcbs:
main:
outlines:
@ -33,5 +26,5 @@ pcbs:
type: anchor_test
anchors:
end:
ref: matrix_one_only
ref: matrix
shift: [10, 10]

9
test/unit/filter.js
View file

@ -13,10 +13,11 @@ describe('Filter', function() {
const names = points => points.map(p => p.meta.name)
it('similar', function() {
// no points filter to no points
filter(undefined, '', undefined).should.deep.equal([])
// and undefined config doesn't filter anything
filter(undefined, '', points).should.deep.equal(Object.values(points))
// an undefined config leads to a default point
filter(undefined, '', points).should.deep.equal([new Point()])
// true shouldn't filter anything, while false should filter everything
filter(true, '', points).should.deep.equal(Object.values(points))
filter(false, '', points).should.deep.equal([])
// objects just propagate to anchor (and then wrap in array for consistency)
filter({}, '', points).should.deep.equal([anchor({}, '', points)()])
// simple name string