Various refinements

This commit is contained in:
Florian Festi 2013-06-29 13:57:56 +02:00
parent 78d4169606
commit 615396e06d
1 changed files with 23 additions and 33 deletions

View File

@ -17,45 +17,29 @@ class Silverware(Boxes):
def wall(self, x=100, y=100, h=100, r=0): def wall(self, x=100, y=100, h=100, r=0):
self.surroundingWall(x,y,r,h, bottom='h', callback={ self.surroundingWall(x,y,r,h, bottom='h', callback={
0 : lambda: self.fingerHolesAt(x/6.0, 0, h), 0 : lambda: self.fingerHolesAt(x/6.0, 0, h-10),
4 : lambda: self.fingerHolesAt(x/3.0-r, 0, h), 4 : lambda: self.fingerHolesAt(x/3.0-r, 0, h-10),
1 : lambda: self.fingerHolesAt(y/2.0-r, 0, h), 1 : lambda: self.fingerHolesAt(y/2.0-r, 0, h-10),
3 : lambda: self.fingerHolesAt(y/2.0-r, 0, h), 3 : lambda: self.fingerHolesAt(y/2.0-r, 0, h-10),
2 : lambda: self.fingerHolesAt(x/2.0-r, 0, h), 2 : lambda: self.fingerHolesAt(x/2.0-r, 0, h-10),
}) })
def smallWall(self, y, h):
l = 0.5*y - self.thickness
self.ctx.save()
self.moveTo(10, 0)
self.fingerJoint(l)
self.corner(90)
self.fingerJoint(h-20)
self.corner(90)
self.edge(l)
self.corner(90)
self.fingerJoint(h-20)
self.corner(90)
self.ctx.restore()
def centerWall(self, x, h): def centerWall(self, x, h):
self.ctx.save() self.ctx.save()
for i in range(2, 5): for i in range(2, 5):
self.fingerHolesAt(i*x/6.0, 0, h-20) self.fingerHolesAt(i*x/6.0, 0, h-10)
self.fingerJoint(x) self.fingerJoint(x)
self.corner(90) self.corner(90)
self.fingerJoint(h-20) self.fingerJoint(h-10)
self.corner(90) self.corner(90)
self.handle(x, 150, 120) self.handle(x, 150, 120)
#self.handle(x, 40, 30, r=2)
self.corner(90) self.corner(90)
self.fingerJoint(h-20) self.fingerJoint(h-10)
self.corner(90) self.corner(90)
self.ctx.restore() self.ctx.restore()
@ -64,19 +48,22 @@ class Silverware(Boxes):
################################################## ##################################################
def render(self, x, y, h, r): def render(self, x, y, h, r):
t = self.thickness
b = self.burn
self.ctx.save() self.ctx.save()
self.moveTo(2, 2) self.moveTo(2, 2)
self.wall(x, y, h+self.thickness+5, r) self.wall(x, y, h, r)
self.moveTo(self.thickness, h+7*self.thickness) self.moveTo(t, h+3*t+8*b)
self.centerWall(x,h) self.centerWall(x, h)
self.moveTo(x+4*self.thickness, 0) self.moveTo(x+2*t+8*b, 0)
l = (y-t)/2.0
for i in range(3): for i in range(3):
self.smallWall(y, h) self.rectangularWall(l, h-10, edges="ffef")
self.moveTo(y/2.0+5, 0) self.moveTo(l+2*t+8*b, 0)
self.moveTo(-1.5*y-55, h-15) self.moveTo(-3.0*(l+2*t+8*b), h-10+t+8*b)
self.basePlate(x, y, r) self.basePlate(x, y, r)
self.ctx.restore() self.ctx.restore()
@ -84,5 +71,8 @@ class Silverware(Boxes):
self.ctx.stroke() self.ctx.stroke()
self.surface.flush() self.surface.flush()
b = Silverware(900, 700) b = Silverware(900, 700, thickness=5.0, burn=0.05)
b.render(250, 250/1.618, 120, 30) b.render(250, 250/1.618, 120, 30)
#b = Silverware(300, 300, thickness=3.0, burn=0.05)
#b.fingerJointSettings = (b.thickness, b.thickness)
#b.render(60, 60/1.618, 40, 10)