From 5c0cc4d732c10eef7e7be2281fd25963e8fc152b Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 1 Sep 2019 15:30:38 +0200 Subject: [PATCH] SlatwallTypeTray: Remove unused code carried over from TypeTray --- boxes/generators/slatwalltypetray.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/boxes/generators/slatwalltypetray.py b/boxes/generators/slatwalltypetray.py index e7a2b8c..e08dbeb 100644 --- a/boxes/generators/slatwalltypetray.py +++ b/boxes/generators/slatwalltypetray.py @@ -93,16 +93,13 @@ class SlatwallTypeTray(_TopEdge): # outer walls - t1, t2, t3, t4 = "eeee" #self.topEdges(self.top_edge) - self.closedtop = False # self.top_edge in "fF" - # x sides self.ctx.save() # outer walls - self.rectangularWall(x, h, [b, "f", t1, "f"], callback=[self.xHoles], move="up") - self.rectangularWall(x, h+bh, [b, "C", t3, "c"], callback=[self.mirrorX(self.xHoles, x), ], move="up") + self.rectangularWall(x, h, [b, "f", "e", "f"], callback=[self.xHoles], move="up") + self.rectangularWall(x, h+bh, [b, "C", "e", "c"], callback=[self.mirrorX(self.xHoles, x), ], move="up") # floor if b != "e": @@ -116,27 +113,21 @@ class SlatwallTypeTray(_TopEdge): for i in range(len(self.sy) - 1): e = [edges.SlottedEdge(self, self.sx, be), "f", edges.SlottedEdge(self, self.sx[::-1], "e", slots=0.5 * hi), "f"] - if self.closedtop and sameh: - e = [edges.SlottedEdge(self, self.sx, be), "f", - edges.SlottedEdge(self, self.sx[::-1], "f", slots=0.5 * hi), "f"] self.rectangularWall(x, hi, e, move="up") # y walls # outer walls - self.trapezoidSideWall(y, h, h+bh, [b, "B", t2, "h"], radius=self.radius, callback=[self.yHoles, ], move="up") + self.trapezoidSideWall(y, h, h+bh, [b, "B", "e", "h"], radius=self.radius, callback=[self.yHoles, ], move="up") self.moveTo(0, 8) - self.trapezoidSideWall(y, h+bh, h, [b, "h", t4, "b"], radius=self.radius, callback=[self.mirrorX(self.yHoles, y), ], move="up") + self.trapezoidSideWall(y, h+bh, h, [b, "h", "e", "b"], radius=self.radius, callback=[self.mirrorX(self.yHoles, y), ], move="up") self.moveTo(0, 8) # inner walls for i in range(len(self.sx) - 1): e = [edges.SlottedEdge(self, self.sy, be, slots=0.5 * hi), "f", "e", "f"] - if self.closedtop and sameh: - e = [edges.SlottedEdge(self, self.sy, be, slots=0.5 * hi),"f", - edges.SlottedEdge(self, self.sy[::-1], "f"), "f"] self.rectangularWall(y, hi, e, move="up")