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

traylayout: fix cuts in inner corners of the floor plate

This commit is contained in:
Florian Festi 2016-04-18 17:41:31 +02:00
parent b0a2ce8b22
commit ff1dc830e3
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
boxes/generators/traylayout.py
View File

@ -229,13 +229,17 @@ class Layout(Boxes):
# Top edge
self.edgeAt(e, posx+self.x[x], posy+t, self.x[x],
-180)
self.edgeAt("e", posx, posy+t, t, -180)
self.edgeAt("e", posx+self.x[x]+t, posy+t, t, -180)
if x==0 or y==0 or not self.floors[y-1][x-1]:
self.edgeAt("e", posx, posy+t, t, -180)
if x==lx-1 or y==0 or not self.floors[y-1][x+1]:
self.edgeAt("e", posx+self.x[x]+t, posy+t, t, -180)
elif y>0 and self.floors[y-1][x]:
# Bottom Edge
self.edgeAt(e, posx, posy, self.x[x])
self.edgeAt("e", posx-t, posy, t)
self.edgeAt("e", posx+self.x[x], posy, t)
if x==0 or y==ly or not self.floors[y][x-1]:
self.edgeAt("e", posx-t, posy, t)
if x==lx-1 or y==ly or not self.floors[y][x+1]:
self.edgeAt("e", posx+self.x[x], posy, t)
posx += self.x[x] + self. thickness
posy += self.y[y-1] + self.thickness
@ -255,13 +259,17 @@ class Layout(Boxes):
else:
# Right edge
self.edgeAt(e, posx+t, posy, self.y[y], 90)
self.edgeAt("e", posx+t, posy-t, t, 90)
self.edgeAt("e", posx+t, posy+self.y[y], t, 90)
if x==lx or y==0 or not self.floors[y-1][x]:
self.edgeAt("e", posx+t, posy+self.y[y], t, 90)
if x==lx or y==ly-1 or not self.floors[y+1][x]:
self.edgeAt("e", posx+t, posy-t, t, 90)
elif x < lx and self.floors[y][x]:
# Left edge
self.edgeAt(e, posx, posy+self.y[y], self.y[y], -90)
self.edgeAt(e, posx, posy+self.y[y]+t, t, -90)
self.edgeAt(e, posx, posy, t, -90)
if x==0 or y==0 or not self.floors[y-1][x-1]:
self.edgeAt("e", posx, posy+self.y[y]+t, t, -90)
if x==0 or y==ly-1 or not self.floors[y+1][x-1]:
self.edgeAt("e", posx, posy, t, -90)
posy += self.y[y] + self.thickness
if x < lx:
posx += self.x[x] + self.thickness

1
documentation/src/TODO.rst
View File

@ -22,7 +22,6 @@ Generators
* Fix traylayout
* Inner corners of the floor
* Move bottom edges of walls without floor underneeth to E
* Make bolts configurable (e.g. box2.py)