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

Use FingerHoles instance for drawing finger holes 

Various places used Boxes.fingerHolesAt which did use the default setting. This way it was not possible to have multiple finger hole settings active at the same times for finger holes.

Now all parts that draw finger holes do no longer have FingerJointSettings but instead have an instance of FingerHoles. Boxes.fingerHolesAt also is an instance
of FingerHoles joining a setting with all the other default finger joint classes.
This commit is contained in:
Florian Festi 2016-04-09 16:18:05 +02:00
parent 223f078726
commit 8cd295328c
2 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
boxes/__init__.py
View File

@ -244,8 +244,8 @@ class Boxes:
surroundingspaces=getattr(self, "fingerjointsurrounding", 1.0))
self.addPart(edges.FingerJointEdge(self, s))
self.addPart(edges.FingerJointEdgeCounterPart(self, s))
self.addPart(edges.FingerHoleEdge(self, s))
self.addPart(edges.FingerHoles(self, s))
self.addPart(edges.FingerHoles(self, s), name="fingerHolesAt")
self.addPart(edges.FingerHoleEdge(self, None))
ss = edges.StackableSettings(self.thickness)
self.addPart(edges.StackableEdge(self, ss, s))
@ -625,28 +625,6 @@ class Boxes:
self.moveTo(x, y)
return dontdraw
# Building blocks
def fingerHolesAt(self, x, y, length, angle=90,
bedBolts=None, bedBoltSettings=None):
"""
Draw holes for a matching finger joint edge
:param x: position
:param y: position
:param length: length of matching edge
:param angle: (Default value = 90)
:param bedBolts: (Default value = None)
:param bedBoltSettings: (Default value = None)
"""
self.ctx.save()
self.moveTo(x, y, angle)
self.fingerHoles(length, bedBolts, bedBoltSettings)
self.ctx.restore()
@restore
def hole(self, x, y, r):
"""

67
boxes/edges.py
View File

@ -356,27 +356,6 @@ class FingerJointEdgeCounterPart(FingerJointEdge):
""" """
return self.boxes.spacing
class FingerHoleEdge(Edge):
"""Edge with holes for a parallel finger joint"""
char = 'h'
def __call__(self, length, dist=None,
bedBolts=None, bedBoltSettings=None, **kw):
if dist is None:
dist = self.fingerHoleEdgeWidth * self.thickness
self.ctx.save()
self.moveTo(0, dist+self.thickness/2)
self.fingerHoles(length, bedBolts, bedBoltSettings)
self.ctx.restore()
# XXX continue path
self.ctx.move_to(0, 0)
self.ctx.line_to(length, 0)
self.ctx.translate(*self.ctx.get_current_point())
def width(self):
""" """
return (self.fingerHoleEdgeWidth+1) * self.thickness
class FingerHoles:
"""Hole matching a finger joint edge"""
def __init__(self, boxes, settings):
@ -384,7 +363,21 @@ class FingerHoles:
self.ctx = boxes.ctx
self.settings = settings
def __call__(self, length, bedBolts=None, bedBoltSettings=None):
def __call__(self, x, y, length, angle=90, bedBolts=None, bedBoltSettings=None):
"""
Draw holes for a matching finger joint edge
:param x: position
:param y: position
:param length: length of matching edge
:param angle: (Default value = 90)
:param bedBolts: (Default value = None)
:param bedBoltSettings: (Default value = None)
"""
self.boxes.ctx.save()
self.boxes.moveTo(x, y, angle)
s, f = self.settings.space, self.settings.finger
fingers = int((length-(self.settings.surroundingspaces-1)*s) //
(s+f))
@ -403,17 +396,41 @@ class FingerHoles:
self.ctx.rectangle(pos+s+b, -self.settings.width/2+b,
f-2*b, self.settings.width - 2*b)
self.ctx.move_to(0, length)
self.ctx.restore()
class FingerHoleEdge(Edge):
"""Edge with holes for a parallel finger joint"""
char = 'h'
def __init__(self, boxes, fingerHoles=None, **kw):
Edge.__init__(self, boxes, None, **kw)
self.fingerHoles = fingerHoles or boxes.fingerHolesAt
def __call__(self, length, dist=None,
bedBolts=None, bedBoltSettings=None, **kw):
if dist is None:
dist = self.fingerHoleEdgeWidth * self.thickness
self.ctx.save()
self.fingerHoles(0, dist+self.thickness/2, length, 0,
bedBolts=bedBolts, bedBoltSettings=bedBoltSettings)
self.ctx.restore()
# XXX continue path
self.ctx.move_to(0, 0)
self.ctx.line_to(length, 0)
self.ctx.translate(*self.ctx.get_current_point())
def width(self):
""" """
return (self.fingerHoleEdgeWidth+1) * self.thickness
class CrossingFingerHoleEdge(Edge):
"""Edge with holes for finger joints 90° above"""
def __init__(self, boxes, height, **kw):
def __init__(self, boxes, height, fingerHoles=None, **kw):
Edge.__init__(self, boxes, None, **kw)
self.fingerHoles = fingerHoles or boxes.fingerHolesAt
self.height = height
def __call__(self, length, **kw):
self.fingerHolesAt(length/2.0, 0, self.height)
self.fingerHoles(length/2.0, 0, self.height)
Edge.__call__(self, length)
#############################################################################