Skip to content

Commit 29a7d18

Browse files
committed
Get rid of most floats in pcbdata
1 parent 9f41fa7 commit 29a7d18

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

InteractiveHtmlBom/generate_interactive_bom.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def sort_func(row):
100100

101101

102102
def normalize(point):
103-
return [point[0] * 1e-6, point[1] * 1e-6]
103+
return [point[0], point[1]]
104104

105105

106106
def parse_draw_segment(d):
@@ -119,28 +119,28 @@ def parse_draw_segment(d):
119119
"type": shape,
120120
"start": start,
121121
"end": end,
122-
"width": d.GetWidth() * 1e-6
122+
"width": d.GetWidth()
123123
}
124124
if shape == "circle":
125125
return {
126126
"type": shape,
127127
"start": start,
128-
"radius": d.GetRadius() * 1e-6,
129-
"width": d.GetWidth() * 1e-6
128+
"radius": d.GetRadius(),
129+
"width": d.GetWidth()
130130
}
131131
if shape == "arc":
132132
a1 = d.GetArcAngleStart() * 0.1
133133
a2 = (d.GetArcAngleStart() + d.GetAngle()) * 0.1
134134
if d.GetAngle() < 0:
135135
(a1, a2) = (a2, a1)
136-
r = d.GetRadius() * 1e-6
136+
r = d.GetRadius()
137137
return {
138138
"type": shape,
139139
"start": start,
140140
"radius": r,
141141
"startangle": a1,
142142
"endangle": a2,
143-
"width": d.GetWidth() * 1e-6
143+
"width": d.GetWidth()
144144
}
145145
if shape == "polygon":
146146
if hasattr(d, "GetPolyShape"):
@@ -186,11 +186,11 @@ def parse_text(d):
186186
angle = d.GetOrientation() * 0.1
187187
print d, angle
188188
if hasattr(d, "GetTextHeight"):
189-
height = d.GetTextHeight() * 1e-6
190-
width = d.GetTextWidth() * 1e-6
189+
height = d.GetTextHeight()
190+
width = d.GetTextWidth()
191191
else:
192-
height = d.GetHeight() * 1e-6
193-
width = d.GetWidth() * 1e-6
192+
height = d.GetHeight()
193+
width = d.GetWidth()
194194
return {
195195
"pos": pos,
196196
"text": d.GetText(),
@@ -317,7 +317,7 @@ def parse_modules(pcb):
317317
print 'Detected self intersecting polygons in custom pad'
318318
pad_dict["polygons"] = parse_poly_set(polygon_set)
319319
if shape == "roundrect":
320-
pad_dict["radius"] = p.GetRoundRectCornerRadius() * 1e-6
320+
pad_dict["radius"] = p.GetRoundRectCornerRadius()
321321
if (p.GetAttribute() == pcbnew.PAD_ATTRIB_STANDARD or
322322
p.GetAttribute() == pcbnew.PAD_ATTRIB_HOLE_NOT_PLATED):
323323
pad_dict["type"] = "th"

InteractiveHtmlBom/render.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ function handleMouseWheel(e, layerdict) {
386386
t.panx += 2 * e.offsetX * zoomd;
387387
t.pany += 2 * e.offsetY * zoomd;
388388
redrawCanvas(layerdict);
389-
console.log(layerdict.transform.zoom);
390389
}
391390

392391
function addMouseHandlers(div, layerdict) {

0 commit comments

Comments
 (0)