Move Slatwall classes to walledges

This commit is contained in:
Florian Festi 2022-02-20 01:18:49 +01:00
parent aba88f3e1d
commit 362dd54e09
3 changed files with 353 additions and 285 deletions

View File

@ -2417,283 +2417,3 @@ class RoundedTriangleFingerHolesEdge(RoundedTriangleEdge):
def __call__(self, length, **kw):
self.fingerHolesAt(0, 0.5*self.settings.thickness, length, 0)
super().__call__(length, **kw)
#############################################################################
#### Slat wall
#############################################################################
class SlatWallSettings(Settings):
"""Settings for SlatWallEdges
Values:
* absolute_params
* bottom_hook : "hook" : "spring", "stud" or "none"
* pitch : 101.6 : vertical spacing of slots middle to middle (in mm)
* hook_depth : 4.0 : horizontal width of the hook
* relative (in multiples of thickness)
* hook_extra_height : 2.0 : space surrounding connectors (multiples of thickness)
* edge_width : 1.0 : space below holes of FingerHoleEdge (multiples of thickness)
"""
absolute_params = {
"type" : ("slatwall", "dinrail"),
"bottom_hook" : ("hook", "spring", "stud", "none"),
"pitch" : 101.6,
"hook_depth" : 4.0,
}
relative_params = {
"hook_extra_height" : 2.0,
"edge_width": 1.0,
}
def edgeObjects(self, boxes, chars="aAbBcCdD", add=True):
edges = [SlatWallEdge(boxes, self),
SlatWallEdgeReversed(boxes, self),
SlatWallJoinedEdge(boxes, self),
SlatWallJoinedEdgeReversed(boxes, self),
SlatWallBackEdge(boxes, self),
SlatWallBackEdgeReversed(boxes, self),
SlatWallHoleEdge(boxes, self),
SlatWallHoleEdgeReversed(boxes, self),
]
return self._edgeObjects(edges, boxes, chars, add)
class SlatWallEdge(BaseEdge):
char = "a"
reversed_ = False
def _top_hook(self, reversed_=False):
if self.settings.type == "slatwall":
w = 6 # vertical width of hook
hd = self.settings.hook_depth
ro = 6 # outer radius
ri = 2 # inner radius
rt = min(1, hd/2) # top radius
poly = [0, -90, 5.5-ri, (-90, ri), 12-ri-w-rt, (90, rt),
hd-2*rt, (90, rt), 12-ro-rt, (90, ro), 5.5+hd-ro, -90,
self.settings.hook_extra_height]
else:
r = 1.
poly = [0, -90, 7.5-r, (90, r), 15+3-2*r, (90, r), 6-2*r, (90, r),
3-r, -90, 1.5, -90, 5+self.settings.hook_extra_height]
if reversed_:
poly = reversed(poly)
self.polyline(*poly)
def _top_hook_len(self):
if self.settings.type == "dinrail":
return (20, self.settings.hook_extra_height)
w = 6 + 1
return (w, self.settings.hook_extra_height - 1)
def _bottom_hook(self, reversed_=False):
slot = 8
hd = self.settings.hook_depth
if self.settings.type == "dinrail":
slot = 20
if self.settings.bottom_hook == "stud":
r = 1.
poly = [0, -90, 7.5-r, (90, r),
slot - 2*r + 2*self.settings.hook_extra_height,
(90, r), 7.5-r, -90, 0]
else:
poly = [2*self.settings.hook_extra_height + slot]
elif self.settings.bottom_hook == "spring":
r_plug = slot*.4
slotslot = slot - r_plug * 2**0.5
poly = [self.settings.hook_extra_height, -90,
5.0, -45, 0, (135, r_plug),
0, 90, 10, -90, slotslot, -90, 10, 90, 0,
(135, r_plug), 0, -45, 5, -90,
self.settings.hook_extra_height]
elif self.settings.bottom_hook == "hook":
d = 2
poly = [self.settings.hook_extra_height + d - 1, -90,
4.5+hd, (90,1), slot-2, (90, 1), hd-1, 90, d,
-90, 5.5, -90, self.settings.hook_extra_height + 1]
elif self.settings.bottom_hook == "stud":
poly = [self.settings.hook_extra_height, -90,
6, (90, 1) , slot-2, (90, 1), 6, -90,
self.settings.hook_extra_height]
else:
poly = [2*self.settings.hook_extra_height + slot]
if reversed_:
poly = reversed(poly)
self.polyline(*poly)
def _bottom_hook_len(self):
if self.settings.type == "dinrail":
return (20 + self.settings.hook_extra_height,
self.settings.hook_extra_height)
slot = 8
return (slot + self.settings.hook_extra_height,
self.settings.hook_extra_height)
def _joint(self, length, reversed_=False):
self.polyline(length)
def __call__(self, length, **kw):
pitch = self.settings.pitch
tht, thb = self._top_hook_len()
bht, bhb = self._bottom_hook_len()
if self.settings.type == "dinrail":
if length >= tht + thb + bht + bhb:
top_len = length - (tht + thb + bht + bhb)
bottom_len = 0
else:
top_len = length - (tht + thb)
bottom_len = None
else: # slatwall
if (length >= pitch + tht + bhb and
self.settings.bottom_hook != "none"):
top_len = ((length-tht-1) // pitch) * pitch - thb - bht
bottom_len = (length-tht) % pitch - bhb
else:
top_len = length-tht-thb
bottom_len = None
if self.reversed_:
if bottom_len is not None:
self._joint(bottom_len, True)
self._bottom_hook(True)
self._joint(top_len, True)
self._top_hook(True)
else:
self._top_hook()
self._joint(top_len)
if bottom_len is not None:
self._bottom_hook()
self._joint(bottom_len)
def margin(self):
return 6+5.5
class SlatWallEdgeReversed(SlatWallEdge):
char = "A"
reversed_ = True
class SlatWallJoinedEdge(SlatWallEdge):
char = "b"
def _joint(self, length, reversed_=False):
t = self.settings.thickness
self.polyline(0, 90, t, -90)
self.edges["f"](length)
self.polyline(0, -90, t, 90)
def startwidth(self):
return self.settings.thickness
class SlatWallJoinedEdgeReversed(SlatWallJoinedEdge):
char = "B"
reversed_ = True
class SlatWallBackEdge(SlatWallEdge):
char = "c"
def _top_hook(self, reversed_=False):
self.polyline(sum(self._top_hook_len()))
def _bottom_hook(self, reversed_=False):
self.polyline(sum(self._bottom_hook_len()))
def _joint(self, length, reversed_=False):
t = self.settings.thickness
self.polyline(0, -90, t, 90)
self.edges["F"](length)
self.polyline(0, 90, t, -90)
def margin(self):
return self.settings.thickness
class SlatWallBackEdgeReversed(SlatWallBackEdge):
char = "C"
reversed_ = True
class SlatWallHoles(SlatWallEdge):
reversed_ = True
def _top_hook(self, reversed_=False):
h = sum(self._top_hook_len())
self.rectangularHole(h/2, 0, h, self.settings.thickness)
self.moveTo(h, 0)
def _bottom_hook(self, reversed_=False):
h = sum(self._bottom_hook_len())
self.rectangularHole(h/2, 0, h, self.settings.thickness)
self.moveTo(h, 0)
def _joint(self, length, reversed_=False):
self.fingerHolesAt(0, 0, length, 0)
self.moveTo(length, 0)
def __call__(self, x, y, length, angle, **kw):
"""
Draw holes for a matching SlatWallJoinedEdge
: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)
"""
with self.boxes.saved_context():
self.boxes.moveTo(x, y, angle)
b = self.boxes.burn
t = self.settings.thickness
if self.boxes.debug: # XXX
width = self.settings.thickness
self.ctx.rectangle(b, -width / 2 + b,
length - 2 * b, width - 2 * b)
SlatWallEdge.__call__(self, length)
class SlatWallHoleEdge(BaseEdge):
"""Edge with holes for a parallel finger joint"""
char = 'd'
description = "Edge (parallel slot wall Holes)"
reversed_ = False
def __init__(self, boxes, slatWallHoles=None, **kw):
settings = None
if isinstance(slatWallHoles, Settings):
settings = slatWallHoles
slatWallHoles = SlatWallHoles(boxes, settings)
super(SlatWallHoleEdge, self).__init__(boxes, settings, **kw)
self.slatWallHoles = slatWallHoles or boxes.slatWallHolesAt
def __call__(self, length, bedBolts=None, bedBoltSettings=None, **kw):
dist = self.slatWallHoles.settings.edge_width
with self.saved_context():
px, angle = (0, 0) if self.reversed_ else (length, 180)
self.slatWallHoles(
px, dist + self.settings.thickness / 2, length, angle)
self.edge(length, tabs=2)
def startwidth(self):
""" """
return self.slatWallHoles.settings.edge_width + self.settings.thickness
class SlatWallHoleEdgeReversed(SlatWallHoleEdge):
char = "D"
reversed_ = True

View File

@ -15,6 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from boxes import *
from boxes import walledges
class SlatwallEdges(Boxes):
"""Shows the different edge types for slat walls"""
@ -25,15 +26,15 @@ class SlatwallEdges(Boxes):
Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings)
self.addSettingsArgs(edges.SlatWallSettings)
self.addSettingsArgs(walledges.SlatWallSettings)
self.buildArgParser(h=120)
def render(self):
s = edges.SlatWallSettings(self.thickness, True,
**self.edgesettings.get("SlatWall", {}))
s = walledges.SlatWallSettings(self.thickness, True,
**self.edgesettings.get("SlatWall", {}))
s.edgeObjects(self)
self.slatWallHolesAt = edges.SlatWallHoles(self, s)
self.wallHolesAt = self.edges["|"]
h = self.h
@ -44,6 +45,6 @@ class SlatwallEdges(Boxes):
self.rectangularWall(40, h, "eAea", move="right")
self.rectangularWall(40, h, "eBeb", move="right")
self.rectangularWall(40, h, "eCec", callback=[
lambda: self.slatWallHolesAt(20, 0, h, 90)], move="right")
lambda: self.wallHolesAt(20, 0, h, 90)], move="right")
self.moveTo(10)
self.rectangularWall(40, h, "eDed", move="right")

347
boxes/walledges.py Normal file
View File

@ -0,0 +1,347 @@
from .edges import Settings, BaseEdge
from boxes import Boxes, edges
class WallMountedBox(Boxes):
ui_group = "WallMounted"
def __init__(self):
super().__init__()
self.addWallSettingsArgs()
def addWallSettingsArgs(self):
self.addSettingsArgs(edges.FingerJointSettings)
self.addSettingsArgs(WallSettings)
self.addSettingsArgs(SlatWallSettings)
self.addSettingsArgs(DinRailSettings)
self.argparser.add_argument(
"--walltype", action="store", type=str, default="plain",
choices=["plain", "plain reenforced", "slatwall", "dinrail"],
help="Type of wall system to attach to")
def generateWallEdges(self):
if self.walltype.startswith("plain"):
s = WallSettings(
self.thickness, True,
**self.edgesettings.get("Wall", {}))
elif self.walltype == "slatwall":
s = SlatWallSettings(
self.thickness, True,
**self.edgesettings.get("SlatWall", {}))
elif self.walltype == "dinrail":
s = DinRailSettings(
self.thickness, True,
**self.edgesettings.get("DinRail", {}))
s.edgeObjects(self)
self.wallHolesAt = self.edges["|"]
if self.walltype.endswith("reenforced"):
self.edges["c"] = self.edges["d"]
self.edges["C"] = self.edges["D"]
#############################################################################
#### Straight Edge / Base class
#############################################################################
class WallEdge(BaseEdge):
_reversed = False
def lengths(self, length):
return [length]
def _joint(self, length):
self.edge(length)
def _section(self, nr, length):
self.edge(length)
def __call__(self, length, **kw):
lengths = list(enumerate(self.lengths(length)))
if self._reversed:
lengths = list(reversed(lengths))
for nr, l in lengths:
if l == 0.0:
continue
if nr % 2:
self._section(nr // 2, l)
else:
self._joint(l)
class WallJoinedEdge(WallEdge):
char = "b"
def _joint(self, length):
t = self.settings.thickness
self.step(-t)
self.edges["f"](length)
self.step(t)
def startwidth(self):
return self.settings.thickness
class WallBackEdge(WallEdge):
def _section(self, nr, length):
self.edge(length)
def _joint(self, length):
t = self.settings.thickness
self.step(t)
self.edges["F"](length)
self.step(-t)
def margin(self):
return self.settings.thickness
class WallHoles(WallEdge):
def _section(self, nr, length):
self.rectangularHole(length/2, 0, length, self.settings.thickness)
self.moveTo(length, 0)
def _joint(self, length):
self.fingerHolesAt(0, 0, length, 0)
self.moveTo(length, 0)
def __call__(self, x, y, length, angle, **kw):
"""
Draw holes for a matching WallJoinedEdge
:param x: position
:param y: position
:param length: length of matching edge
:param angle: (Default value = 90)
"""
with self.boxes.saved_context():
self.boxes.moveTo(x, y, angle)
b = self.boxes.burn
t = self.settings.thickness
if self.boxes.debug: # XXX
width = self.settings.thickness
self.ctx.rectangle(b, -width / 2 + b,
length - 2 * b, width - 2 * b)
self.boxes.moveTo(length, 0, 180)
super().__call__(length)
class WallHoleEdge(WallHoles):
"""Edge with holes for a parallel finger joint"""
description = "Edge (parallel slot wall Holes)"
def __init__(self, boxes, wallHoles, **kw):
super().__init__(boxes, wallHoles.settings, **kw)
self.wallHoles = wallHoles
def __call__(self, length, bedBolts=None, bedBoltSettings=None, **kw):
dist = self.wallHoles.settings.edge_width + self.settings.thickness / 2
with self.saved_context():
px, angle = (0, 0) if self._reversed else (length, 180)
self.wallHoles(
px, dist, length, angle)
self.edge(length, tabs=2)
def startwidth(self):
""" """
return self.wallHoles.settings.edge_width + self.settings.thickness
def margin(self):
return 0.0
class WallSettings(Settings):
"""Settings for plain WallEdges
Values:
* relative (in multiples of thickness)
* edge_width : 1.0 : space below holes of FingerHoleEdge (multiples of thickness)
"""
absolute_params = {
}
relative_params = {
"edge_width": 1.0,
}
base_class = WallEdge
def edgeObjects(self, boxes, chars="aAbBcCdD|", add=True):
bc = self.base_class
bn = bc.__name__
wallholes = type(bn+"Hole", (WallHoles, bc), {})(boxes, self)
edges = [bc(boxes, self),
type(bn+"Reversed", (bc,), {'_reversed' : True})(boxes, self),
type(bn+"Joined", (WallJoinedEdge, bc), {})(boxes, self),
type(bn+"JoinedReversed", (WallJoinedEdge, bc), {'_reversed' : True})(boxes, self),
type(bn+"Back", (WallBackEdge, bc), {})(boxes, self),
type(bn+"BackReversed", (WallBackEdge, bc), {'_reversed' : True})(boxes, self),
type(bn+"Hole", (WallHoleEdge, bc), {})(boxes, wallholes),
type(bn+"HoleReversed", (WallHoleEdge, bc), {'_reversed' : True})(boxes, wallholes),
wallholes,
]
return self._edgeObjects(edges, boxes, chars, add)
#############################################################################
#### Slat wall
#############################################################################
class SlatWallEdge(WallEdge):
def lengths(self, length):
pitch = self.settings.pitch
he = self.settings.hook_extra_height
lengths = []
if length < 6 + he:
return [length]
lengths = [0, 6 + he]
length -= 6 + he
if length > pitch:
lengths.extend([(length // pitch) * pitch - 8 - 2*he,
8 + 2*he,
length % pitch])
else:
lengths.append(length)
return lengths
def _section(self, nr, length):
w = 6 # vertical width of hook
hd = self.settings.hook_depth
ro = 6 # outer radius
ri = 2 # inner radius
rt = min(1, hd/2) # top radius
slot = 8
if nr == 0:
poly = [0, -90, 5.5-ri, (-90, ri), 12-ri-w-rt, (90, rt),
hd-2*rt, (90, rt), 12-ro-rt, (90, ro), 5.5+hd-ro, -90,
length-6]
elif nr == 1:
if self.settings.bottom_hook == "spring":
r_plug = slot*.4
slotslot = slot - r_plug * 2**0.5
poly = [self.settings.hook_extra_height, -90,
5.0, -45, 0, (135, r_plug),
0, 90, 10, -90, slotslot, -90, 10, 90, 0,
(135, r_plug), 0, -45, 5, -90,
self.settings.hook_extra_height]
elif self.settings.bottom_hook == "hook":
d = 2
poly = [self.settings.hook_extra_height + d - 1, -90,
4.5+hd, (90,1), slot-2, (90, 1), hd-1, 90, d,
-90, 5.5, -90, self.settings.hook_extra_height + 1]
elif self.settings.bottom_hook == "stud":
poly = [self.settings.hook_extra_height, -90,
6, (90, 1) , slot-2, (90, 1), 6, -90,
self.settings.hook_extra_height]
else:
poly = [2*self.settings.hook_extra_height + slot]
if self._reversed:
poly = reversed(poly)
self.polyline(*poly)
def margin(self):
return 6+5.5
class SlatWallSettings(WallSettings):
"""Settings for SlatWallEdges
Values:
* absolute_params
* bottom_hook : "hook" : "spring", "stud" or "none"
* pitch : 101.6 : vertical spacing of slots middle to middle (in mm)
* hook_depth : 4.0 : horizontal width of the hook
* relative (in multiples of thickness)
* hook_extra_height : 2.0 : space surrounding connectors (multiples of thickness)
* edge_width : 1.0 : space below holes of FingerHoleEdge (multiples of thickness)
"""
absolute_params = {
"bottom_hook" : ("hook", "spring", "stud", "none"),
"pitch" : 101.6,
"hook_depth" : 4.0,
}
relative_params = {
"hook_extra_height" : 2.0,
"edge_width": 1.0,
}
base_class = SlatWallEdge
#############################################################################
#### DIN rail
#############################################################################
class DinRailEdge(WallEdge):
def lengths(self, length):
if length < 20:
return [length]
if length > 50 and self.settings.bottom == "stud":
return [0, 20, length - 40, 20]
return [0, 20,
length - 20]
def _section(self, nr, length):
d = self.settings.depth
if nr == 0:
r = 1.
poly = [0, -90, d-0.5-r, (90, r), 15+3-2*r, (90, r),
d-4-r, 45,
4*2**.5, -45, .5, -90, 6]
elif nr == 1:
slot = 20
if self.settings.bottom == "stud":
r = 1.
poly = [0, -90, 7.5-r, (90, r),
slot - 2*r,
(90, r), 7.5-r, -90, 0]
else:
poly = [slot]
if self._reversed:
poly = reversed(poly)
self.polyline(*poly)
def margin(self):
return self.settings.depth
class DinRailSettings(WallSettings):
"""Settings for DinRailEdges
Values:
* absolute_params
* bottom : "stud" : "stud" or "none"
* depth : 4.0 : horizontal width of the hook
* relative (in multiples of thickness)
* edge_width : 1.0 : space below holes of FingerHoleEdge (multiples of thickness)
"""
absolute_params = {
"bottom" : ("stud", "none"),
"depth" : 8.0,
}
relative_params = {
"edge_width": 1.0,
}
base_class = DinRailEdge