From 0c87b43b529b2e1848568569997a9e361d308fcb Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 2 Oct 2022 11:29:07 +0200 Subject: [PATCH] FrenchCleats: Make top and bottom section small enough to not have finger holes in them. With the new changes to FingerJoints fingers can now fit into much smaller edges and here that only weakens the connection between left and right of the edge. --- boxes/walledges.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/boxes/walledges.py b/boxes/walledges.py index 616911b..879cba0 100644 --- a/boxes/walledges.py +++ b/boxes/walledges.py @@ -373,14 +373,20 @@ class FrenchCleatEdge(WallEdge): t = self.settings.thickness s = self.settings.spacing h = d * math.tan(math.radians(self.settings.angle)) - if length < 3*t + 1.5*d + h: + # make small enough to not have finger holes + top = 0.5*t + bottom = 0.5 * t + if length < top + bottom + 1.5*d + h: return [length] - if length > 5*t + 1.5*d + h and self.settings.bottom == "stud": - return [2*t, 1.5*d + h, length - 3*t - 2.5*d - h, d, t] - if length > 3*t + 2.5*d + s and self.settings.bottom == "hook": - dist = ((length - 3*t - 1.5*d - h) // s ) * s - 1.5*d -h - return [2*t, 1.5*d + h, dist, 1.5*d + h, length-dist-2*t-3*d-2*h] - return [2*t, 2.5*d, length-2*t-2.5*d] + if length > top + bottom + 2*t + 1.5*d + h and \ + self.settings.bottom == "stud": + return [top, 1.5*d + h, length - top - bottom - 2.5*d - h, + d, bottom] + if length > top + bottom + 2.5*d + s and \ + self.settings.bottom == "hook": + dist = ((length - top - t - 1.5*d - h) // s ) * s - 1.5*d - h + return [top, 1.5*d + h, dist, 1.5*d + h, length-dist-top-3*d-2*h] + return [top, 2.5*d, length-top-2.5*d] def _section(self, nr, length): d = self.settings.depth