From 3c56abf0477a796bef6acb6d47cc01a673136b3c Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: Sun, 17 Apr 2016 18:08:09 +0200
Subject: [PATCH] traylayout: Use straight edges on walls with no floor
 underneeth

Still need to move it over to use E in stead of e
---
 boxes/generators/traylayout.py | 21 +++++++++++++++++++--
 documentation/src/TODO.rst     |  3 ++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/boxes/generators/traylayout.py b/boxes/generators/traylayout.py
index 8e9e837..2dbbecc 100755
--- a/boxes/generators/traylayout.py
+++ b/boxes/generators/traylayout.py
@@ -88,6 +88,16 @@ class Layout(Boxes):
             result += 1
         return result
 
+    def vFloor(self, x, y):
+        "Is there floor under vertical wall"
+        return ((x>0 and self.floors[y][x-1]) or
+                (x<len(self.x) and self.floors[y][x]))
+
+    def hFloor(self, x, y):
+        "Is there foor under horizontal wall"
+        return ((y>0 and self.floors[y-1][x]) or
+                (y<len(self.y) and self.floors[y][x]))
+
     @restore
     def edgeAt(self, edge, x, y, length, angle=0):
         self.moveTo(x, y, angle)
@@ -125,7 +135,10 @@ class Layout(Boxes):
                     break
                 end = start
                 while end < lx and self.hwalls[y][end]:
-                    edges.append("f") # e for no ground
+                    if self.hFloor(end, y):
+                        edges.append("f")
+                    else:
+                        edges.append("e") # XXX E?
                     lengths.append(self.x[end])
                     edges.append("eCs"[self.vWalls(end+1, y)])
                     lengths.append(self.thickness)
@@ -162,7 +175,10 @@ class Layout(Boxes):
                     break
                 end = start
                 while  end < ly and self.vwalls[end][x]:
-                    edges.append("f") # e for no ground
+                    if self.vFloor(x, end):
+                        edges.append("f")
+                    else:
+                        edges.append("e") # XXX E?
                     lengths.append(self.y[end])
                     edges.append("eCs"[self.hWalls(x, end+1)])
                     lengths.append(self.thickness)
@@ -175,6 +191,7 @@ class Layout(Boxes):
                     "f" : "e",
                     "s" : "s",
                     "e" : "e",
+                    "E" : "e",
                     "C" : "e"}[e] for e in reversed(edges)]
                 edges = ["e" if e == "s" else e for e in edges]
                 self.rectangularWall(sum(lengths), h, [
diff --git a/documentation/src/TODO.rst b/documentation/src/TODO.rst
index 2acc67e..8a374f5 100644
--- a/documentation/src/TODO.rst
+++ b/documentation/src/TODO.rst
@@ -15,6 +15,7 @@ Infrastructure
 
 * Use stretch setting in flexboxes
 * Add CLI params for flex settings
+* Make CompoundEdge support differences in Edge.width()
 
 Generators
 ..........
@@ -22,7 +23,7 @@ Generators
 * Fix traylayout
 
   * Inner corners of the floor
-  * Bottom edges of walls without floor underneeth
+  * Move bottom edges of walls without floor underneeth to E
 
 * Make bolts configurable (e.g. box2.py)
 * Treasure Chest with rounded lid and living hinge