Baseplate holes proper positioning

florianfesti · Nov 9, 2024 · 81da6a6 · 81da6a6
1 parent 0906c85
commit 81da6a6
Show file tree

Hide file tree

Showing 2 changed files with 701 additions and 699 deletions.
diff --git a/boxes/generators/hobbycase.py b/boxes/generators/hobbycase.py
@@ -34,6 +34,7 @@ class HobbyCase(Boxes):
 
     def __init__(self) -> None:
         super().__init__()
+        self.debug = None
         self.add_rails = True
         self.add_cover = True
         self.addSettingsArgs(boxes.edges.FingerJointSettings)
@@ -48,9 +49,6 @@ def __init__(self) -> None:
 
 
     def prepare(self):
-        self.margin_x = 0.75
-        self.margin_y = 0.75
-
         self.cols = len(self.unit_w)
 
         self.sum_w = sum(self.unit_w)
@@ -134,7 +132,7 @@ def shelves(self, move="up"):
     def railSet(self, sideLength, backLength, move=None):
         self.ctx.save()
         self.rectangularWall( sideLength,0, "feSe", move="right")
-        self.rectangularWall( backLength,0, "feSe", move="right")
+        self.rectangularWall( backLength-8*self.thickness,0, "feSe", move="right")
         self.rectangularWall( sideLength,0, "feSe", move="right")
         self.move(2*sideLength+backLength, 3*self.thickness, move)
 
@@ -145,15 +143,15 @@ def rails(self, move="up"):
 
     def vertical_holes_callback(self):
         for col in range(1, self.cols):
-            posx = sum(self.unit_w[:col]) + col * 2 * self.thickness
-            posy = 1.5 * self.thickness
+            posx = self.thickness + sum(self.unit_w[:col]) + col * 2 * self.thickness
+            posy = 2 * self.thickness
             self.doubleFingerHolesAt(posx, posy, self.total_h, angle=90)
 
     def horizontal_holes_callback(self):
         for col in range(self.cols):
             for row in range(1, self.rows):
-                posx = self.thickness + sum(self.unit_w[:col]) + col * 2 * self.thickness
-                posy = self.thickness + row * self.unit_h + row * self.thickness + 0.75 * self.thickness
+                posx = 2 * self.thickness + sum(self.unit_w[:col]) + col * 2 * self.thickness
+                posy = 2 * self.thickness + row * self.unit_h + row * self.thickness
                 self.fingerHolesAt(posx, posy, self.unit_w[col], angle=0)
 
     def baseplate_callback(self):
@@ -166,6 +164,10 @@ def base_plate(self, move="up"):
                              label="base plate\n(%ix%i)" % (self.total_w, self.total_h), move=move)
 
     def render(self) -> None:
+        if self.debug:
+            self.spacing = 0
+        else:
+            self.spacing = 10
         self.prepare()
         self.base_plate()
         self.shelves()