From 6e2e29e6ffeb17deaed3c3395af366b361987d4d Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 23 Jan 2022 16:39:40 +0100 Subject: [PATCH] SlatwallDrillBox: Use finger holes to fix bottom in place Otherwise all the weight of the drills is just held up by glue --- boxes/generators/drillstand.py | 8 ++++++-- boxes/generators/slatwalldrillbox.py | 7 +++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/boxes/generators/drillstand.py b/boxes/generators/drillstand.py index 55a3894..391d9a5 100644 --- a/boxes/generators/drillstand.py +++ b/boxes/generators/drillstand.py @@ -157,13 +157,17 @@ Assembly: Start with putting the slots of the inner walls together. Then add the else: raise ValueError("Only edges h and f supported: ") self.corner(a) - self.edgeCorner(edges[0], edges[1], 90) + self.edgeCorner(edges[0], "e", 90) + self.corner(-90) + self.edgeCorner("e", edges[1], 90) edges[1](eh+h) self.edgeCorner(edges[1], edges[2], 90) edges[2](x) self.edgeCorner(edges[2], edges[3], 90) edges[3](h) - self.edgeCorner(edges[3], edges[0], 90) + self.edgeCorner(edges[3], "e", 90) + self.corner(-90) + self.edgeCorner("e", edges[0], 90) self.moveTo(0, self.burn+edges[0].startwidth(), 0) diff --git a/boxes/generators/slatwalldrillbox.py b/boxes/generators/slatwalldrillbox.py index 07daeb6..ec5f49b 100644 --- a/boxes/generators/slatwalldrillbox.py +++ b/boxes/generators/slatwalldrillbox.py @@ -75,15 +75,14 @@ class SlatwallDrillBox(DrillStand): bottom_angle = math.atan(self.extra_height / x) # radians - self.xOutsideWall(sh[0], "fFeF", move="up") + self.xOutsideWall(sh[0], "hFeF", move="up") for i in range(1, len(sy)): self.xWall(i, move="up") - self.xOutsideWall(sh[-1], "fCec", move="up") + self.xOutsideWall(sh[-1], "hCec", move="up") - self.rectangularWall(x/math.cos(bottom_angle)-t*math.tan(bottom_angle), y, "FeFe", callback=[self.bottomCB], move="up") + self.rectangularWall(x/math.cos(bottom_angle)-t*math.tan(bottom_angle), y, "fefe", callback=[self.bottomCB], move="up") self.sideWall(move="right") for i in range(1, len(sx)): self.yWall(i, move="right") self.sideWall(self.extra_height, move="right") -