Fixes for bedbolts

This commit is contained in:
Florian Festi 2016-03-21 15:57:28 +01:00
parent 7d8111f44a
commit 87250c4142
1 changed files with 3 additions and 3 deletions

View File

@ -244,7 +244,7 @@ class FingerJointEdge(Edge):
leftover = length - fingers*(space+finger) + space leftover = length - fingers*(space+finger) + space
s, f, thickness = space, finger, self.thickness s, f, thickness = space, finger, self.thickness
d, d_nut, h_nut, l, l1 = bedBoltSettings or self.bedBoltSettings d, d_nut, h_nut, l, l1 = bedBoltSettings or self.boxes.bedBoltSettings
p = 1 if positive else -1 p = 1 if positive else -1
if fingers <= 0: if fingers <= 0:
@ -442,7 +442,7 @@ class FingerHoles:
(s+f)) (s+f))
if bedBolts: if bedBolts:
fingers = bedBolts.numFingers(fingers) fingers = bedBolts.numFingers(fingers)
d, d_nut, h_nut, l, l1 = bedBoltSettings or self.bedBoltSettings d, d_nut, h_nut, l, l1 = bedBoltSettings or self.boxes.bedBoltSettings
leftover = length - fingers*(s+f) - f leftover = length - fingers*(s+f) - f
b = self.boxes.burn b = self.boxes.burn
if self.boxes.debug: if self.boxes.debug:
@ -451,7 +451,7 @@ class FingerHoles:
for i in range(fingers): for i in range(fingers):
pos = leftover/2.0+i*(s+f) pos = leftover/2.0+i*(s+f)
if bedBolts and bedBolts.drawBolt(i): if bedBolts and bedBolts.drawBolt(i):
self.hole(pos+0.5*s, 0, d*0.5) self.boxes.hole(pos+0.5*s, 0, d*0.5)
self.ctx.rectangle(pos+s+b, -self.settings.width/2+b, self.ctx.rectangle(pos+s+b, -self.settings.width/2+b,
f-2*b, self.settings.width - 2*b) f-2*b, self.settings.width - 2*b)