@@ -51,7 +51,7 @@ def prepare(self):
5151 self .cols = len (self .unit_w )
5252
5353 self .sum_w = sum (self .unit_w )
54- self .inside_w = self .sum_w + 2 * (self .cols - 1 ) * self .thickness
54+ self .inside_w = self .sum_w + 1 * (self .cols - 1 ) * self .thickness
5555 self .outside_w = self .inside_w + 2 * self .thickness
5656
5757 self .sum_h = self .rows * self .unit_h
@@ -86,7 +86,7 @@ def vertical_walls(self, move="up"):
8686
8787 self .verticalWall (self .outside_depth , self .inside_h , label = "left" )
8888
89- for i in range (2 * (self .cols - 1 )):
89+ for i in range (1 * (self .cols - 1 )):
9090 self .verticalWall (self .inside_depth , self .inside_h , label = "vertical wall" )
9191
9292 self .verticalWall (self .outside_depth , self .inside_h , move = "up" , label = "right" )
@@ -98,7 +98,7 @@ def verticalWall(self, x, y, edges="feff", move="right", label=None):
9898 self .rectangularWall (x , y , edges , callback = [self .slotsHolesCallback ], move = move , label = label )
9999
100100 def slotsHolesCallback (self ):
101- self .cut_shelve_holes_in_single_column (self .inside_depth , 0 )
101+ self .cut_shelve_side_holes_in_single_column (self .inside_depth , 0 )
102102
103103 # Cover
104104 def cover (self , move = "up" ):
@@ -120,7 +120,7 @@ def shelves(self, move="up"):
120120 y = self .inside_depth
121121 self .partsMatrix (self .shelves_n [columnIndex ], 0 , move ,
122122 self .rectangularWall ,
123- x , y , "efff " , label = f"shelf (column { columnIndex } )\n ({ x } x{ y } )" )
123+ x , y , "eƒfƒ " , label = f"shelf (column { columnIndex } )\n ({ x } x{ y } )" )
124124
125125 # Rails
126126 def rails (self , move = "up" ):
@@ -130,9 +130,9 @@ def rails(self, move="up"):
130130
131131 def railSet (self , sideLength , backLength , move = None ):
132132 self .ctx .save ()
133- self .rectangularWall ( sideLength ,0 , "feSe " , move = "right" )
133+ self .rectangularWall ( sideLength ,0 , "ƒeSe " , move = "right" )
134134 self .rectangularWall ( backLength - 8 * self .thickness ,0 , "feSe" , move = "right" )
135- self .rectangularWall ( sideLength ,0 , "feSe " , move = "right" )
135+ self .rectangularWall ( sideLength ,0 , "ƒeSe " , move = "right" )
136136 self .move (2 * sideLength + backLength , 3 * self .thickness , move )
137137
138138 # Base plate
@@ -143,8 +143,8 @@ def base_plate(self, move="up"):
143143
144144 def baseplate_callback (self ):
145145 for col in range (self .cols ):
146- posx = sum (self .unit_w [:col ]) + col * 2 * self .thickness
147- self .cut_shelve_holes_in_single_column (self .unit_w [col ], posx )
146+ posx = sum (self .unit_w [:col ]) + col * 1 * self .thickness
147+ self .cut_shelve_back_holes_in_single_column (self .unit_w [col ], posx )
148148 self .cut_double_wall_holes (self .inside_h )
149149
150150 # Render
@@ -162,10 +162,15 @@ def render(self):
162162 # Helper functions
163163 def cut_double_wall_holes (self , length ):
164164 for col in range (1 , self .cols ):
165- posx = self .thickness + sum (self .unit_w [:col ]) + (col - 1 ) * 2 * self .thickness
166- self .doubleFingerHolesAt (posx , 0 , length , angle = 90 )
165+ posx = 0.5 * self .thickness + sum (self .unit_w [:col ]) + (col - 1 ) * 1 * self .thickness
166+ self .fingerHolesAt (posx , 0 , length , angle = 90 )
167167
168- def cut_shelve_holes_in_single_column (self , length , posx = 0 ):
168+ def cut_shelve_back_holes_in_single_column (self , length , posx = 0 ):
169169 for row in range (1 , self .rows ):
170170 posy = 0.5 * self .thickness + row * self .unit_h + (row - 1 ) * self .thickness
171171 self .fingerHolesAt (posx , posy , length , angle = 0 )
172+
173+ def cut_shelve_side_holes_in_single_column (self , length , posx = 0 ):
174+ for row in range (1 , self .rows ):
175+ posy = 0.5 * self .thickness + row * self .unit_h + (row - 1 ) * self .thickness
176+ self .triFingerHolesAt (posx , posy , length , angle = 0 )
0 commit comments