From 30bee5ac5912aa604b144af3ea0de4d646510b03 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Wed, 11 Dec 2024 22:42:41 +0100 Subject: [PATCH] GridfinityBase: Simplify the code --- boxes/generators/gridfinitybase.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/boxes/generators/gridfinitybase.py b/boxes/generators/gridfinitybase.py index 72946c7c..dd956cea 100644 --- a/boxes/generators/gridfinitybase.py +++ b/boxes/generators/gridfinitybase.py @@ -45,25 +45,19 @@ def __init__(self) -> None: def generate_grid(self): pitch = self.pitch - nx, ny = self.x, self.y opening = self.opening - for col in range(nx): - for row in range(ny): + for col in range(self.x): + for row in range(self.y): lx = col*pitch+pitch/2 ly = row*pitch+pitch/2 self.rectangularHole(lx, ly, opening, opening) if self.cut_pads: self.rectangularHole(lx, ly, opening - 2, opening - 2, r=2) - def create_base_plate(self): + def render(self): pitch = self.pitch nx, ny = self.x, self.y opening = self.opening - self.rectangularWall(nx*pitch, ny*pitch, move="up", callback=[self.generate_grid]) - - def create_tray(self): - pitch = self.pitch - nx, ny = self.x, self.y margin = self.m x, y, h = nx*pitch, ny*pitch, self.h t = self.thickness @@ -73,6 +67,8 @@ def create_tray(self): b = self.edges.get(self.bottom_edge, self.edges["F"]) sideedge = "F" # if self.vertical_edges == "finger joints" else "h" + self.rectangularWall(nx*pitch, ny*pitch, move="up", callback=[self.generate_grid]) + self.rectangularWall(x, h, [b, sideedge, t1, sideedge], ignore_widths=[1, 6], move="right") self.rectangularWall(y, h, [b, "f", t2, "f"], @@ -85,8 +81,4 @@ def create_tray(self): if self.bottom_edge != "e": self.rectangularWall(x, y, "ffff", move="up") - def render(self): - self.create_base_plate() - self.create_tray() - self.lid(self.x*self.pitch + 2*self.m, - self.y*self.pitch + 2*self.m) + self.lid(x, y)