diff --git a/boxes/generators/box2.py b/boxes/generators/box2.py
index 0a0a53f..6c1afda 100755
--- a/boxes/generators/box2.py
+++ b/boxes/generators/box2.py
@@ -16,135 +16,9 @@
from boxes import *
from boxes.edges import Bolts
-import inspect
+from boxes.lids import _TopEdge, _ChestLid
-class ChestLid(Boxes):
-
- def getR(self, x, angle=0):
- t = self.thickness
- d = x - 2*math.sin(math.radians(angle)) * (3*t)
-
- r = d / 2.0 / math.cos(math.radians(angle))
- return r
-
- def side(self, x, angle=0, move=""):
- if "a" not in self.edges:
- s = edges.FingerJointSettings(self.thickness, True,
- finger=1.0, space=1.0)
- s.edgeObjects(self, "aA.")
-
- t = self.thickness
- r = self.getR(x, angle)
- if self.move(x+2*t, 0.5*x+3*t, move, True):
- return
-
- self.moveTo(t, 0)
- self.edge(x)
- self.corner(90+angle)
- self.edges["a"](3*t)
- self.corner(180-2*angle, r)
- self.edges["a"](3*t)
- self.corner(90+angle)
-
- self.move(x+2*t, 0.5*x+3*t, move, False)
-
- def top(self, x, y, angle=0, move=None):
- if "a" not in self.edges:
- s = edges.FingerJointSettings(self.thickness, True,
- finger=1.0, space=1.0)
- s.edgeObjects(self, "aA.")
-
- t = self.thickness
- l = math.radians(180-2*angle) * self.getR(x, angle)
-
- tw = l + 6*t
- th = y+2*t
-
- if self.move(tw, th, move, True):
- return
-
- self.edges["A"](3*t)
- self.edges["X"](l, y+2*t)
- self.edges["A"](3*t)
- self.corner(90)
- self.edge(y+2*t)
- self.corner(90)
- self.edges["A"](3*t)
- self.edge(l)
- self.edges["A"](3*t)
- self.corner(90)
- self.edge(y+2*t)
- self.corner(90)
-
- self.move(tw, th, move)
-
- def drawAddOnLid(self, x, y, style):
- if style == "flat":
- self.rectangularWall(x, y, "eeee", move="right")
- self.rectangularWall(x, y, "EEEE", move="up")
- elif style == "chest":
- self.side(x, move="right")
- self.side(x, move="up")
- self.side(x, move="left only")
- self.top(x, y, move="up")
- else:
- return False
- return True
-
-class TopEdge(Boxes):
-
- def addTopEdgeSettings(self):
- self.addSettingsArgs(edges.FingerJointSettings)
- self.addSettingsArgs(edges.StackableSettings)
- self.addSettingsArgs(edges.HingeSettings)
- self.addSettingsArgs(edges.CabinetHingeSettings)
- self.addSettingsArgs(edges.LidSettings)
- self.addSettingsArgs(edges.ClickSettings)
-
- def topEdges(self, top_edge):
- t1 = t2 = t3 = t4 = self.edges.get(top_edge, self.edges["e"])
-
- if t1.char == "i":
- t2 = t4 = "e"
- t3 = "j"
- elif t1.char == "k":
- t2 = t4 = "e"
- elif t1.char == "L":
- t1 = "M"
- t2 = "e"
- t3 = "N"
- elif t1.char == "v":
- t2 = t3 = t4 = "e"
-
- return [t1, t2, t3, t4]
-
- def drawLid(self, x, y, top_edge, bedBolts=[None, None]):
- d2, d3 = bedBolts
- if top_edge == "c":
- self.rectangularWall(x, y, "CCCC", bedBolts=[d2, d3, d2, d3], move="up")
- elif top_edge == "f":
- self.rectangularWall(x, y, "FFFF", move="up")
- elif top_edge == "L":
- self.rectangularWall(x, y, "nlmE", move="up")
- elif top_edge == "i":
- self.rectangularWall(x, y, "IEJe", move="up")
- elif top_edge == "k":
- outset = self.edges["k"].settings.outset
- self.edges["k"].settings.setValues(self.thickness, outset=True)
- lx = x/2.0-0.1*self.thickness
- self.edges['k'].settings.setValues(self.thickness, grip_length=5)
- self.rectangularWall(lx, y, "IeJe", move="right")
- self.rectangularWall(lx, y, "IeJe", move="up")
- self.rectangularWall(lx, y, "IeJe", move="left only")
- self.edges["k"].settings.setValues(self.thickness, outset=outset)
- elif top_edge == "v":
- self.rectangularWall(x, y, "VEEE", move="up")
- self.edges["v"].parts(move="up")
- else:
- return False
- return True
-
-class Box2(TopEdge, ChestLid):
+class Box2(_TopEdge, _ChestLid):
"""Box various options for different stypes and lids"""
def __init__(self):
diff --git a/boxes/generators/ubox.py b/boxes/generators/ubox.py
index 28dc00e..ab89b1a 100644
--- a/boxes/generators/ubox.py
+++ b/boxes/generators/ubox.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2013-2014 Florian Festi
+# Copyright (C) 2013-2017 Florian Festi
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,12 +15,10 @@
# along with this program. If not, see .
from boxes import *
-from boxes.generators.box2 import TopEdge, ChestLid
-from boxes.edges import Bolts
-import inspect
+from boxes.lids import _TopEdge, _ChestLid
import math
-class UBox(TopEdge, ChestLid):
+class UBox(_TopEdge, _ChestLid):
"""Box various options for different stypes and lids"""
def __init__(self):
diff --git a/boxes/lids.py b/boxes/lids.py
new file mode 100644
index 0000000..ee5ab2d
--- /dev/null
+++ b/boxes/lids.py
@@ -0,0 +1,143 @@
+# Copyright (C) 2013-2014 Florian Festi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+from boxes import *
+
+class _ChestLid(Boxes):
+
+ def getR(self, x, angle=0):
+ t = self.thickness
+ d = x - 2*math.sin(math.radians(angle)) * (3*t)
+
+ r = d / 2.0 / math.cos(math.radians(angle))
+ return r
+
+ def side(self, x, angle=0, move=""):
+ if "a" not in self.edges:
+ s = edges.FingerJointSettings(self.thickness, True,
+ finger=1.0, space=1.0)
+ s.edgeObjects(self, "aA.")
+
+ t = self.thickness
+ r = self.getR(x, angle)
+ if self.move(x+2*t, 0.5*x+3*t, move, True):
+ return
+
+ self.moveTo(t, 0)
+ self.edge(x)
+ self.corner(90+angle)
+ self.edges["a"](3*t)
+ self.corner(180-2*angle, r)
+ self.edges["a"](3*t)
+ self.corner(90+angle)
+
+ self.move(x+2*t, 0.5*x+3*t, move, False)
+
+ def top(self, x, y, angle=0, move=None):
+ if "a" not in self.edges:
+ s = edges.FingerJointSettings(self.thickness, True,
+ finger=1.0, space=1.0)
+ s.edgeObjects(self, "aA.")
+
+ t = self.thickness
+ l = math.radians(180-2*angle) * self.getR(x, angle)
+
+ tw = l + 6*t
+ th = y+2*t
+
+ if self.move(tw, th, move, True):
+ return
+
+ self.edges["A"](3*t)
+ self.edges["X"](l, y+2*t)
+ self.edges["A"](3*t)
+ self.corner(90)
+ self.edge(y+2*t)
+ self.corner(90)
+ self.edges["A"](3*t)
+ self.edge(l)
+ self.edges["A"](3*t)
+ self.corner(90)
+ self.edge(y+2*t)
+ self.corner(90)
+
+ self.move(tw, th, move)
+
+ def drawAddOnLid(self, x, y, style):
+ if style == "flat":
+ self.rectangularWall(x, y, "eeee", move="right")
+ self.rectangularWall(x, y, "EEEE", move="up")
+ elif style == "chest":
+ self.side(x, move="right")
+ self.side(x, move="up")
+ self.side(x, move="left only")
+ self.top(x, y, move="up")
+ else:
+ return False
+ return True
+
+class _TopEdge(Boxes):
+
+ def addTopEdgeSettings(self):
+ self.addSettingsArgs(edges.FingerJointSettings)
+ self.addSettingsArgs(edges.StackableSettings)
+ self.addSettingsArgs(edges.HingeSettings)
+ self.addSettingsArgs(edges.CabinetHingeSettings)
+ self.addSettingsArgs(edges.LidSettings)
+ self.addSettingsArgs(edges.ClickSettings)
+
+ def topEdges(self, top_edge):
+ t1 = t2 = t3 = t4 = self.edges.get(top_edge, self.edges["e"])
+
+ if t1.char == "i":
+ t2 = t4 = "e"
+ t3 = "j"
+ elif t1.char == "k":
+ t2 = t4 = "e"
+ elif t1.char == "L":
+ t1 = "M"
+ t2 = "e"
+ t3 = "N"
+ elif t1.char == "v":
+ t2 = t3 = t4 = "e"
+
+ return [t1, t2, t3, t4]
+
+ def drawLid(self, x, y, top_edge, bedBolts=[None, None]):
+ d2, d3 = bedBolts
+ if top_edge == "c":
+ self.rectangularWall(x, y, "CCCC", bedBolts=[d2, d3, d2, d3], move="up")
+ elif top_edge == "f":
+ self.rectangularWall(x, y, "FFFF", move="up")
+ elif top_edge == "L":
+ self.rectangularWall(x, y, "nlmE", move="up")
+ elif top_edge == "i":
+ self.rectangularWall(x, y, "IEJe", move="up")
+ elif top_edge == "k":
+ outset = self.edges["k"].settings.outset
+ self.edges["k"].settings.setValues(self.thickness, outset=True)
+ lx = x/2.0-0.1*self.thickness
+ self.edges['k'].settings.setValues(self.thickness, grip_length=5)
+ self.rectangularWall(lx, y, "IeJe", move="right")
+ self.rectangularWall(lx, y, "IeJe", move="up")
+ self.rectangularWall(lx, y, "IeJe", move="left only")
+ self.edges["k"].settings.setValues(self.thickness, outset=outset)
+ elif top_edge == "v":
+ self.rectangularWall(x, y, "VEEE", move="up")
+ self.edges["v"].parts(move="up")
+ else:
+ return False
+ return True
+