From 2ec1cb287c551a2963de82d7ac352caacffd2028 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 17 Apr 2016 18:04:23 +0200 Subject: [PATCH] More fixups... Turns out BaseEdge.startAngle and BaseEdge.endAngle are already used - sortof --- boxes/__init__.py | 3 +-- boxes/edges.py | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boxes/__init__.py b/boxes/__init__.py index 5d0b53d..94eb070 100755 --- a/boxes/__init__.py +++ b/boxes/__init__.py @@ -260,7 +260,7 @@ class Boxes: name = part.__class__.__name__ name = name[0].lower() + name[1:] #if not hasattr(self, name): - if isinstance(part, edges.Edge): + if isinstance(part, edges.BaseEdge): self.edges[part.char] = part else: setattr(self, name, part) @@ -1061,7 +1061,6 @@ class Boxes: raise ValueError("four edges required") edges = [self.edges.get(e, e) for e in edges] edges += edges # append for wrapping around - overallwidth = x + edges[-1].spacing() + edges[1].spacing() overallheight = y + edges[0].spacing() + edges[2].spacing() diff --git a/boxes/edges.py b/boxes/edges.py index 94262be..82652d3 100644 --- a/boxes/edges.py +++ b/boxes/edges.py @@ -185,6 +185,14 @@ class BaseEdge: """Space the edge needs outside of the inner space of the part""" return self.width() + self.margin() + def startAngle(self): + """Not yet supported""" + return 0.0 + + def endAngle(self): + """Not yet supported""" + return 0.0 + class Edge(BaseEdge): """Straight edge""" char = 'e'