Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TrayLayout: Fix burn correction for bottom plate 

All edges were missing the burn correction outset (aka kerf).
This commit is contained in:
Florian Festi 2018-08-27 15:13:31 +02:00
parent fc127237fd
commit b4a95aca15
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
boxes/generators/traylayout.py
View File

@ -142,6 +142,7 @@ class TrayLayout2(TrayLayout):
lx = len(self.x) lx = len(self.x)
ly = len(self.y) ly = len(self.y)
t = self.thickness t = self.thickness
b = self.burn
t2 = self.thickness / 2.0 t2 = self.thickness / 2.0
hasfloor = False hasfloor = False
@ -279,19 +280,19 @@ class TrayLayout2(TrayLayout):
self.fingerHolesAt(posx, posy + t2, self.x[x], angle=0) self.fingerHolesAt(posx, posy + t2, self.x[x], angle=0)
else: else:
# Top edge # Top edge
self.edgeAt(e, posx + self.x[x], posy + t, self.x[x], self.edgeAt(e, posx + self.x[x], posy + t + b, self.x[x],
-180) -180)
if x == 0 or y == 0 or not self.floors[y - 1][x - 1]: if x == 0 or y == 0 or not self.floors[y - 1][x - 1]:
self.edgeAt("e", posx, posy + t, t, -180) self.edgeAt("e", posx, posy + t + b, t, -180)
if x == lx - 1 or y == 0 or not self.floors[y - 1][x + 1]: if x == lx - 1 or y == 0 or not self.floors[y - 1][x + 1]:
self.edgeAt("e", posx + self.x[x] + t, posy + t, t, -180) self.edgeAt("e", posx + self.x[x] + t, posy + t + b, t, -180)
elif y > 0 and self.floors[y - 1][x]: elif y > 0 and self.floors[y - 1][x]:
# Bottom Edge # Bottom Edge
self.edgeAt(e, posx, posy, self.x[x]) self.edgeAt(e, posx, posy - b, self.x[x])
if x == 0 or y == ly or not self.floors[y][x - 1]: if x == 0 or y == ly or not self.floors[y][x - 1]:
self.edgeAt("e", posx - t, posy, t) self.edgeAt("e", posx - t, posy - b, t)
if x == lx - 1 or y == ly or not self.floors[y][x + 1]: if x == lx - 1 or y == ly or not self.floors[y][x + 1]:
self.edgeAt("e", posx + self.x[x], posy, t) self.edgeAt("e", posx + self.x[x], posy - b, t)
posx += self.x[x] + self.thickness posx += self.x[x] + self.thickness
posy += self.y[y - 1] + self.thickness posy += self.y[y - 1] + self.thickness
@ -310,18 +311,18 @@ class TrayLayout2(TrayLayout):
self.fingerHolesAt(posx + t2, posy, self.y[y]) self.fingerHolesAt(posx + t2, posy, self.y[y])
else: else:
# Right edge # Right edge
self.edgeAt(e, posx + t, posy, self.y[y], 90) self.edgeAt(e, posx + t + b, posy, self.y[y], 90)
if x == lx or y == 0 or not self.floors[y - 1][x]: if x == lx or y == 0 or not self.floors[y - 1][x]:
self.edgeAt("e", posx + t, posy + self.y[y], t, 90) self.edgeAt("e", posx + t + b, posy + self.y[y], t, 90)
if x == lx or y == ly - 1 or not self.floors[y + 1][x]: if x == lx or y == ly - 1 or not self.floors[y + 1][x]:
self.edgeAt("e", posx + t, posy - t, t, 90) self.edgeAt("e", posx + t + b, posy - t, t, 90)
elif x < lx and self.floors[y][x]: elif x < lx and self.floors[y][x]:
# Left edge # Left edge
self.edgeAt(e, posx, posy + self.y[y], self.y[y], -90) self.edgeAt(e, posx - b, posy + self.y[y], self.y[y], -90)
if x == 0 or y == 0 or not self.floors[y - 1][x - 1]: if x == 0 or y == 0 or not self.floors[y - 1][x - 1]:
self.edgeAt("e", posx, posy + self.y[y] + t, t, -90) self.edgeAt("e", posx - b, posy + self.y[y] + t, t, -90)
if x == 0 or y == ly - 1 or not self.floors[y + 1][x - 1]: if x == 0 or y == ly - 1 or not self.floors[y + 1][x - 1]:
self.edgeAt("e", posx, posy, t, -90) self.edgeAt("e", posx -b, posy, t, -90)
posy += self.y[y] + self.thickness posy += self.y[y] + self.thickness
if x < lx: if x < lx:
posx += self.x[x] + self.thickness posx += self.x[x] + self.thickness