Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make joints of box sides go to the very bottom 

for NotesHolder, TypeTray and UniversalBox.
The same should be done to many other boxes as soon as they get the
bottom_edge parameter

Resolves: #111
This commit is contained in:
Florian Festi 2019-12-14 14:18:38 +01:00
parent 8cb5a8e042
commit aba9631b00
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boxes/generators/notesholder.py
View File

@ -81,18 +81,23 @@ class NotesHolder(Boxes):
b2 = b b2 = b
with self.saved_context(): with self.saved_context():
self.rectangularWall(y, h, [b, "F", "e", "F"], move="right") self.rectangularWall(y, h, [b, "F", "e", "F"],
ignore_widths=[1, 6], move="right")
if self.opening == 0.0: if self.opening == 0.0:
self.rectangularWall(x, h, [b, "f", "e", "f"], move="right") self.rectangularWall(x, h, [b, "f", "e", "f"],
ignore_widths=[1, 6], move="right")
else: else:
self.rectangularWall(sides, h, [b2, "e", "e", "f"], move="right") self.rectangularWall(sides, h, [b2, "e", "e", "f"],
self.rectangularWall(sides, h, [b2, "e", "e", "f"], move="right mirror") ignore_widths=[1, 6], move="right")
self.rectangularWall(sides, h, [b2, "e", "e", "f"],
ignore_widths=[1, 6], move="right mirror")
self.rectangularWall(x, h, [b, "F", "e", "F"], move="up only") self.rectangularWall(x, h, [b, "F", "e", "F"],
ignore_widths=[1, 6], move="up only")
with self.saved_context(): with self.saved_context():
self.rectangularWall(y, h, [b, "F", "e", "F"], move="right") self.rectangularWall(y, h, [b, "F", "e", "F"], ignore_widths=[1, 6], move="right")
self.rectangularWall(x, h, [b, "f", "e", "f"], move="right") self.rectangularWall(x, h, [b, "f", "e", "f"], ignore_widths=[1, 6], move="right")
self.rectangularWall(y, h, [b, "F", "e", "F"], move="up only") self.rectangularWall(y, h, [b, "F", "e", "F"], move="up only")
if self.bottom_edge != "e": if self.bottom_edge != "e":

12
boxes/generators/typetray.py
View File

@ -99,8 +99,10 @@ class TypeTray(_TopEdge):
self.ctx.save() self.ctx.save()
# outer walls # outer walls
self.rectangularWall(x, h, [b, "F", t1, "F"], callback=[self.xHoles, None, self.gripHole], move="up") self.rectangularWall(x, h, [b, "F", t1, "F"], callback=[self.xHoles, None, self.gripHole],
self.rectangularWall(x, h, [b, "F", t3, "F"], callback=[self.mirrorX(self.xHoles, x), ], move="up") ignore_widths=[1, 6], move="up")
self.rectangularWall(x, h, [b, "F", t3, "F"], callback=[self.mirrorX(self.xHoles, x), ],
ignore_widths=[1, 6], move="up")
# floor # floor
if b != "e": if b != "e":
@ -134,8 +136,10 @@ class TypeTray(_TopEdge):
# y walls # y walls
# outer walls # outer walls
self.rectangularWall(y, h, [b, "f", t2, "f"], callback=[self.yHoles, ], move="up") self.rectangularWall(y, h, [b, "f", t2, "f"], callback=[self.yHoles, ],
self.rectangularWall(y, h, [b, "f", t4, "f"], callback=[self.mirrorX(self.yHoles, y), ], move="up") ignore_widths=[1, 6], move="up")
self.rectangularWall(y, h, [b, "f", t4, "f"], callback=[self.mirrorX(self.yHoles, y), ],
ignore_widths=[1, 6], move="up")
# inner walls # inner walls
for i in range(len(self.sx) - 1): for i in range(len(self.sx) - 1):

5
boxes/generators/universalbox.py
View File

@ -68,8 +68,10 @@ class UniversalBox(_TopEdge, _ChestLid):
with self.saved_context(): with self.saved_context():
self.rectangularWall(x, h, [b, "F", t1, "F"], self.rectangularWall(x, h, [b, "F", t1, "F"],
ignore_widths=[1, 6],
bedBolts=[d2], move="up") bedBolts=[d2], move="up")
self.rectangularWall(x, h, [b, "F", t3, "F"], self.rectangularWall(x, h, [b, "F", t3, "F"],
ignore_widths=[1, 6],
bedBolts=[d2], move="up") bedBolts=[d2], move="up")
if self.bottom_edge != "e": if self.bottom_edge != "e":
@ -83,10 +85,13 @@ class UniversalBox(_TopEdge, _ChestLid):
self.drawAddOnLid(x, y, self.lid) self.drawAddOnLid(x, y, self.lid)
self.rectangularWall(x, h, [b, "F", t3, "F"], self.rectangularWall(x, h, [b, "F", t3, "F"],
ignore_widths=[1, 6],
bedBolts=[d2], move="right only") bedBolts=[d2], move="right only")
self.rectangularWall(y, h, [b, "f", t2, "f"], self.rectangularWall(y, h, [b, "f", t2, "f"],
ignore_widths=[1, 6],
bedBolts=[d3], move="up") bedBolts=[d3], move="up")
self.rectangularWall(y, h, [b, "f", t4, "f"], self.rectangularWall(y, h, [b, "f", t4, "f"],
ignore_widths=[1, 6],
bedBolts=[d3], move="up") bedBolts=[d3], move="up")