Skip to content

Commit d816f5e

Browse files
committed
ShutterBox: Switch x and y parameters
x is described as "width" which should be the width of the shutter. Thanks to https://github.com/code2344 for pointing this out! Resolves: #603
1 parent 4d5f4bf commit d816f5e

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

boxes/generators/shutterbox.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def __init__(self) -> None:
143143
self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5)
144144
self.addSettingsArgs(edges.FlexSettings, distance=.75, connection=2.)
145145

146-
self.buildArgParser(x=150, y=100, h=100)
146+
self.buildArgParser(x=100, y=150, h=100)
147147
self.argparser.add_argument(
148148
"--radius", action="store", type=float, default=40.0,
149149
help="radius of the corners")
@@ -165,34 +165,34 @@ def render(self):
165165

166166
t = self.thickness
167167
self.ctx.save()
168-
self.side(x, h, r, style, move="right")
169-
self.side(x, h, r, style, move="right")
168+
self.side(y, h, r, style, move="right")
169+
self.side(y, h, r, style, move="right")
170170
if style == "single":
171-
self.rectangularWall(y, h, "fFEF", move="right")
171+
self.rectangularWall(x, h, "fFEF", move="right")
172172
else:
173-
self.rectangularWall(y, h-r, "fFeF", move="right")
174-
self.rectangularWall(y, h-r, "fFeF", move="right")
173+
self.rectangularWall(x, h-r, "fFeF", move="right")
174+
self.rectangularWall(x, h-r, "fFeF", move="right")
175175

176176
if style == "double":
177177
self.cornerRadius(r, two=True, move="right")
178178

179179
self.cornerRadius(r, two=True, move="right")
180180
if style == "single":
181-
self.rails(x, r, move="right")
181+
self.rails(y, r, move="right")
182182
else:
183-
self.rails2(x, r, move="right")
183+
self.rails2(y, r, move="right")
184184

185185
self.ctx.restore()
186-
self.side(x, h, r, style, move="up only")
186+
self.side(y, h, r, style, move="up only")
187187

188-
self.rectangularWall(x, y, "FFFF", move="right")
188+
self.rectangularWall(y, x, "FFFF", move="right")
189189

190190
if style == "single":
191-
self.door(x-r+0.5*math.pi*r + 3*t, y-0.2*t, move="right")
191+
self.door(y-r+0.5*math.pi*r + 3*t, x-0.2*t, move="right")
192192
else:
193-
self.door(x-2*r+math.pi*r + 3*t, y-0.2*t, move="right")
193+
self.door(y-2*r+math.pi*r + 3*t, x-0.2*t, move="right")
194194

195-
self.rectangularWall(2*t, y-2.2*t, edges="eeef", move="right")
195+
self.rectangularWall(2*t, x-2.2*t, edges="eeef", move="right")
196196

197197

198198
a = 90. / n
@@ -204,28 +204,28 @@ def render(self):
204204

205205
if style == "double":
206206
if h - 2*r > 2*t:
207-
self.rectangularWall(h - 2*r, y, "fBfe", move="right")
208-
self.rectangularWall(ls, y, "fAfb", move="right")
207+
self.rectangularWall(h - 2*r, x, "fBfe", move="right")
208+
self.rectangularWall(ls, x, "fAfb", move="right")
209209
else:
210-
self.rectangularWall(ls, y, "fAfe", move="right")
210+
self.rectangularWall(ls, x, "fAfe", move="right")
211211

212212
for i in range(n-2):
213-
self.rectangularWall(ls, y, "fAfa", move="right")
213+
self.rectangularWall(ls, x, "fAfa", move="right")
214214

215-
self.rectangularWall(ls, y, "fBfa", move="right")
215+
self.rectangularWall(ls, x, "fBfa", move="right")
216216

217-
self.rectangularWall(x-2*r, y, "fbfb", move="right")
217+
self.rectangularWall(y-2*r, x, "fbfb", move="right")
218218
else:
219-
self.rectangularWall(x-r, y, "fbfe", move="right")
219+
self.rectangularWall(y-r, x, "fbfe", move="right")
220220

221-
self.rectangularWall(ls, y, "fafB", move="right")
221+
self.rectangularWall(ls, x, "fafB", move="right")
222222

223223
for i in range(n-2):
224-
self.rectangularWall(ls, y, "fafA", move="right")
224+
self.rectangularWall(ls, x, "fafA", move="right")
225225

226226

227227
if h - 2*r > 2*t:
228-
self.rectangularWall(ls, y, "fbfA", move="right")
229-
self.rectangularWall(h - 2*r, y, "fefB", move="right")
228+
self.rectangularWall(ls, x, "fbfA", move="right")
229+
self.rectangularWall(h - 2*r, x, "fefB", move="right")
230230
else:
231-
self.rectangularWall(ls, y, "fefA", move="right")
231+
self.rectangularWall(ls, x, "fefA", move="right")

0 commit comments

Comments
 (0)