Skip to content

Commit bb4d4ca

Browse files
AlexCPUflorianfesti
authored andcommitted
Fix incorrect slot size
1 parent c564118 commit bb4d4ca

File tree

2 files changed

+110
-104
lines changed

2 files changed

+110
-104
lines changed

boxes/generators/wallslottedholder.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@ def __call__(self, length, **kw):
2626
r1 = min(self.radius, ds/2, (wt-ws)/2)
2727
r2 = min(self.radius, ws/2)
2828
w = (wt-ws)/2 - r1
29+
t = self.thickness
30+
d = min(2*t, (wt-ws)/4.)
31+
self.edge(d)
2932
for i in range(self.number):
3033
self.polyline(w, (90, r1), ds-r1-r2, (-90, r2), ws-2*r2,
3134
(-90, r2), ds-r1-r2, (90, r1), w)
35+
self.edge(d)
3236

3337
class WallSlottedHolder(_WallMountedBox):
3438
"""Wall tool holder with slots"""
@@ -89,11 +93,11 @@ def backCB(self):
8993

9094
d = min(2*t, (wt-ws)/4.)
9195
self.wallHolesAt(d, 0, self.h, 90)
92-
self.wallHolesAt(n*wt-d, 0, self.h, 90)
96+
self.wallHolesAt(n*wt+d, 0, self.h, 90)
9397

9498
for i in range(1, n):
9599
if self.brace(i):
96-
self.wallHolesAt(i*wt, 0, self.h, 90)
100+
self.wallHolesAt(i*wt+d, 0, self.h, 90)
97101

98102
def topCB(self):
99103
n = self.number
@@ -104,11 +108,11 @@ def topCB(self):
104108

105109
d = min(2*t, (wt-ws)/4.)
106110
self.fingerHolesAt(d, 0, l, 90)
107-
self.fingerHolesAt(n*wt-d, 0, l, 90)
111+
self.fingerHolesAt(n*wt+d, 0, l, 90)
108112

109113
for i in range(1, n):
110114
if self.brace(i):
111-
self.fingerHolesAt(i*wt, 0, l, 90)
115+
self.fingerHolesAt(i*wt+d, 0, l, 90)
112116

113117
def render(self):
114118
self.generateWallEdges()
@@ -119,7 +123,9 @@ def render(self):
119123
wt = self.tool_width
120124
n = self.number
121125

122-
self.rectangularWall(n*wt, self.h, "eeee", callback=[self.backCB], move="up")
123-
self.rectangularWall(n*wt, l1+l2, [FrontEdge(self, None), "e","e","e"], callback=[self.topCB], move="up")
126+
d = min(2*t, (wt-ws)/4.)
127+
128+
self.rectangularWall(n*wt+2*d, self.h, "eeee", callback=[self.backCB], move="up")
129+
self.rectangularWall(n*wt+2*d, l1+l2, [FrontEdge(self, None), "e","e","e"], callback=[self.topCB], move="up")
124130
self.moveTo(0, t)
125131
self.rectangularTriangle(l1+l2, self.h, "fbe", r=3*t, num=self.braces())

0 commit comments

Comments
 (0)