@@ -26,9 +26,13 @@ def __call__(self, length, **kw):
26
26
r1 = min (self .radius , ds / 2 , (wt - ws )/ 2 )
27
27
r2 = min (self .radius , ws / 2 )
28
28
w = (wt - ws )/ 2 - r1
29
+ t = self .thickness
30
+ d = min (2 * t , (wt - ws )/ 4. )
31
+ self .edge (d )
29
32
for i in range (self .number ):
30
33
self .polyline (w , (90 , r1 ), ds - r1 - r2 , (- 90 , r2 ), ws - 2 * r2 ,
31
34
(- 90 , r2 ), ds - r1 - r2 , (90 , r1 ), w )
35
+ self .edge (d )
32
36
33
37
class WallSlottedHolder (_WallMountedBox ):
34
38
"""Wall tool holder with slots"""
@@ -89,11 +93,11 @@ def backCB(self):
89
93
90
94
d = min (2 * t , (wt - ws )/ 4. )
91
95
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 )
93
97
94
98
for i in range (1 , n ):
95
99
if self .brace (i ):
96
- self .wallHolesAt (i * wt , 0 , self .h , 90 )
100
+ self .wallHolesAt (i * wt + d , 0 , self .h , 90 )
97
101
98
102
def topCB (self ):
99
103
n = self .number
@@ -104,11 +108,11 @@ def topCB(self):
104
108
105
109
d = min (2 * t , (wt - ws )/ 4. )
106
110
self .fingerHolesAt (d , 0 , l , 90 )
107
- self .fingerHolesAt (n * wt - d , 0 , l , 90 )
111
+ self .fingerHolesAt (n * wt + d , 0 , l , 90 )
108
112
109
113
for i in range (1 , n ):
110
114
if self .brace (i ):
111
- self .fingerHolesAt (i * wt , 0 , l , 90 )
115
+ self .fingerHolesAt (i * wt + d , 0 , l , 90 )
112
116
113
117
def render (self ):
114
118
self .generateWallEdges ()
@@ -119,7 +123,9 @@ def render(self):
119
123
wt = self .tool_width
120
124
n = self .number
121
125
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" )
124
130
self .moveTo (0 , t )
125
131
self .rectangularTriangle (l1 + l2 , self .h , "fbe" , r = 3 * t , num = self .braces ())
0 commit comments