From 2154245cde0a88505d240620d34577d2e6594366 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 27 Jun 2021 16:24:01 +0200 Subject: [PATCH] AngledBox: Render surrounding walls in order --- boxes/generators/angledbox.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/boxes/generators/angledbox.py b/boxes/generators/angledbox.py index 2283f22..f9dbb2c 100644 --- a/boxes/generators/angledbox.py +++ b/boxes/generators/angledbox.py @@ -120,29 +120,28 @@ class AngledBox(Boxes): fingers = self.top in ("angled lid2", "angled hole") - self.rectangularWall(lx, h, move="right", - edges=b+"GfG" if fingers else b+"GeG", - label="wall {}".format(1)) - + cnt = 0 for j in range(2): + cnt += 1 + if j == 0 or n % 2: + self.rectangularWall(lx, h, move="right", + edges=b+"GfG" if fingers else b+"GeG", + label="wall {}".format(cnt)) + else: + self.rectangularWall(lx, h, move="right", + edges=b+"gfg" if fingers else b+"geg", + label="wall {}".format(cnt)) for i in range(n): - if i % 2: + cnt += 1 + if (i+j*((n+1)%2)) % 2: # reverse for second half if even n self.rectangularWall(side, h, move="right", edges=b+"GfG" if fingers else b+"GeG", - label="wall {}".format(i+2+j*(n+1))) + label="wall {}".format(cnt)) else: self.rectangularWall(side, h, move="right", edges=b+"gfg" if fingers else b+"geg", - label="wall {}".format(i+2+j*(n+1))) - - if n % 2: - self.rectangularWall(lx, h, move="right", - edges=b+"GfG" if fingers else b+"GeG", - label="wall {}".format(n+2)) - else: - self.rectangularWall(lx, h, move="right", - edges=b+"gfg" if fingers else b+"geg", - label="wall {}".format(n+2)) + label="wall {}".format(cnt)) +