Skip to content
This repository was archived by the owner on Jul 23, 2018. It is now read-only.

Commit 27cbe49

Browse files
mcousmcous
committed
fix flipped pad hole dimensions
1 parent 83d80e2 commit 27cbe49

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

‎dist/gerber-to-svg.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,8 +1088,8 @@ parseAD = function(block) {
10881088
};
10891089
if (mods.length > 2) {
10901090
params.hole = {
1091-
width: parseFloat(mods[2]),
1092-
height: parseFloat(mods[1])
1091+
width: parseFloat(mods[1]),
1092+
height: parseFloat(mods[2])
10931093
};
10941094
} else if (mods.length > 1) {
10951095
params.hole = {
@@ -1106,8 +1106,8 @@ parseAD = function(block) {
11061106
};
11071107
if (mods.length > 3) {
11081108
params.hole = {
1109-
width: parseFloat(mods[3]),
1110-
height: parseFloat(mods[2])
1109+
width: parseFloat(mods[2]),
1110+
height: parseFloat(mods[3])
11111111
};
11121112
} else if (mods.length > 2) {
11131113
params.hole = {
@@ -1124,8 +1124,8 @@ parseAD = function(block) {
11241124
};
11251125
if (mods.length > 3) {
11261126
params.hole = {
1127-
width: parseFloat(mods[3]),
1128-
height: parseFloat(mods[2])
1127+
width: parseFloat(mods[2]),
1128+
height: parseFloat(mods[3])
11291129
};
11301130
} else if (mods.length > 2) {
11311131
params.hole = {
@@ -1146,8 +1146,8 @@ parseAD = function(block) {
11461146
}
11471147
if (mods.length > 4) {
11481148
params.hole = {
1149-
width: parseFloat(mods[4]),
1150-
height: parseFloat(mods[3])
1149+
width: parseFloat(mods[3]),
1150+
height: parseFloat(mods[4])
11511151
};
11521152
} else if (mods.length > 3) {
11531153
params.hole = {

‎dist/gerber-to-svg.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/plotter.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/plotter.coffee

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ parseAD = (block) ->
2424
mods = block[4+code.length..].split 'X'
2525
params = { dia: parseFloat mods[0] }
2626
if mods.length > 2 then params.hole = {
27-
width: parseFloat mods[2]
28-
height: parseFloat mods[1]
27+
width: parseFloat mods[1]
28+
height: parseFloat mods[2]
2929
}
3030
else if mods.length > 1 then params.hole = { dia: parseFloat mods[1] }
3131
ad = tool code, params
3232
when 'R,'
3333
mods = block[4+code.length..].split 'X'
3434
params = { width: parseFloat(mods[0]), height: parseFloat(mods[1]) }
3535
if mods.length > 3 then params.hole = {
36-
width: parseFloat mods[3]
37-
height: parseFloat mods[2]
36+
width: parseFloat mods[2]
37+
height: parseFloat mods[3]
3838
}
3939
else if mods.length > 2 then params.hole = { dia: parseFloat mods[2] }
4040
ad = tool code, params
4141
when 'O,'
4242
mods = block[4+code.length..].split 'X'
4343
params = { width: parseFloat(mods[0]), height: parseFloat(mods[1]) }
4444
if mods.length > 3 then params.hole = {
45-
width: parseFloat mods[3]
46-
height: parseFloat mods[2]
45+
width: parseFloat mods[2]
46+
height: parseFloat mods[3]
4747
}
4848
else if mods.length > 2 then params.hole = { dia: parseFloat mods[2] }
4949
params.obround = true
@@ -56,8 +56,8 @@ parseAD = (block) ->
5656
}
5757
if mods[2]? then params.degrees = parseFloat mods[2]
5858
if mods.length > 4 then params.hole = {
59-
width: parseFloat mods[4]
60-
height: parseFloat mods[3]
59+
width: parseFloat mods[3]
60+
height: parseFloat mods[4]
6161
}
6262
else if mods.length > 3 then params.hole = { dia: parseFloat mods[3] }
6363
ad = tool code, params

‎test/plotter_test.coffee

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ describe 'Plotter class', ->
9696
{ circle: { r: 0.7 } }
9797
]
9898
(p.tools.D12?).should.be.false
99-
p.parameter [ '%', 'ADD12C,1.6X0.5X0.5', '%' ]
99+
p.parameter [ '%', 'ADD12C,1.6X0.6X0.5', '%' ]
100100
(p.tools.D12?).should.be.true
101101
p.defs.should.containDeep [
102-
{ mask: { _: [ { rect: {} }, { rect: {} } ] } }
102+
{ mask: { _: [ { rect: {} }, { rect: {width:0.6, height:0.5} } ] } }
103103
{ circle: { r: 0.8 } }
104104
]
105105
it 'should add standard rectangles to the tools list', ->
@@ -110,7 +110,7 @@ describe 'Plotter class', ->
110110
'%'
111111
'ADD10R,1X1'
112112
'ADD11R,1.1X1.1X0.5'
113-
'ADD12R,1.2X1.2X0.5X0.5'
113+
'ADD12R,1.2X1.2X0.6X0.5'
114114
'%'
115115
]
116116
(p.tools.D10?).should.be.true
@@ -120,7 +120,7 @@ describe 'Plotter class', ->
120120
{ rect: { width: 1 } }
121121
{ mask: { _: [ { circle: { r: 0.25 } } ] } }
122122
{ rect: { width: 1.1 } }
123-
{ mask: { _: [ { rect: {} }, { rect: {} } ] } }
123+
{ mask: { _: [ { rect: {} }, { rect: {width:0.6, height:0.5} } ] } }
124124
{ rect: { width: 1.2 } }
125125
]
126126

@@ -132,7 +132,7 @@ describe 'Plotter class', ->
132132
'%'
133133
'ADD10O,1X1'
134134
'ADD11O,1.2X1.2X0.5'
135-
'ADD12O,1.4X1.4X0.5X0.5'
135+
'ADD12O,1.4X1.4X0.6X0.5'
136136
'%'
137137
]
138138
(p.tools.D10?).should.be.true
@@ -142,7 +142,7 @@ describe 'Plotter class', ->
142142
{ rect: { width: 1, rx: 0.5 } }
143143
{ mask: { _: [ { circle: { r: 0.25 } } ] } }
144144
{ rect: { width: 1.2, rx: 0.6 } }
145-
{ mask: { _: [ { rect: {} }, { rect: {} } ] } }
145+
{ mask: { _: [ { rect: {} }, { rect: {width:0.6, height:0.5} } ] } }
146146
{ rect: { width: 1.4, rx: 0.7 } }
147147
]
148148
it 'should add standard polygons to the tools list', ->
@@ -155,7 +155,7 @@ describe 'Plotter class', ->
155155
'ADD10P,5X3'
156156
'ADD11P,5X4X45'
157157
'ADD12P,5X4X0X0.6'
158-
'ADD13P,5X4X0X0.6X0.6'
158+
'ADD13P,5X4X0X0.6X0.5'
159159
'%'
160160
]
161161
(p.tools.D10?).should.be.true
@@ -167,7 +167,7 @@ describe 'Plotter class', ->
167167
{ polygon: {} }
168168
{ mask: { _: [ { circle: { r: 0.3 } } ] } }
169169
{ polygon: {} }
170-
{ mask: { _: [ { rect: {} }, { rect: {} } ] } }
170+
{ mask: { _: [ { rect: {} }, { rect: {width:0.6, height:0.5} } ] } }
171171
{ polygon: {} }
172172
]
173173

0 commit comments

Comments
 (0)