From 8d754c3855a3792767524d98f37629834ce05a1c Mon Sep 17 00:00:00 2001 From: christopher Date: Mon, 30 Jan 2017 09:55:44 +0100 Subject: [PATCH] Use default finger/width settings of 2.0 for every box --- boxes/edges.py | 4 ++-- boxes/generators/angledbox.py | 3 +-- boxes/generators/bintray.py | 3 +-- boxes/generators/box.py | 1 - boxes/generators/box2.py | 1 - boxes/generators/box3.py | 1 - boxes/generators/magazinefile.py | 1 - boxes/generators/regularbox.py | 3 +-- boxes/generators/roundedbox.py | 1 - boxes/generators/typetray.py | 3 +-- 10 files changed, 6 insertions(+), 15 deletions(-) diff --git a/boxes/edges.py b/boxes/edges.py index 28e179b..9a22ce9 100644 --- a/boxes/edges.py +++ b/boxes/edges.py @@ -514,8 +514,8 @@ Values: relative_params = { "space": 1.0, - "finger": 1.0, - "width": 1.0, + "finger": 2.0, + "width": 2.0, "edge_width": 1.0, "play" : 0.0, } diff --git a/boxes/generators/angledbox.py b/boxes/generators/angledbox.py index 684aca9..c7845f6 100644 --- a/boxes/generators/angledbox.py +++ b/boxes/generators/angledbox.py @@ -22,7 +22,6 @@ class AngledBox(Boxes): def __init__(self): Boxes.__init__(self) - self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0) self.buildArgParser("x", "y", "h", "outside") self.argparser.add_argument( "--n", action="store", type=int, default=5, @@ -100,7 +99,7 @@ class AngledBox(Boxes): else: lx = x - 2 * r + side - edges.FingerJointSettings(self.thickness, True, angle=360./(2 * (n+1)), finger=2, space=2).edgeObjects(self, chars="gGH") + edges.FingerJointSettings(self.thickness, True, angle=360./(2 * (n+1))).edgeObjects(self, chars="gGH") self.ctx.save() diff --git a/boxes/generators/bintray.py b/boxes/generators/bintray.py index d8f38fe..8eeb152 100644 --- a/boxes/generators/bintray.py +++ b/boxes/generators/bintray.py @@ -49,8 +49,7 @@ class BinTray(Boxes): def __init__(self): Boxes.__init__(self) self.buildArgParser("sx", "sy", "h", "outside") - self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0, - surroundingspaces=0.5) + self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5) self.argparser.add_argument( "--front", action="store", type=float, default=0.4, help="fraction of bin height covert with slope") diff --git a/boxes/generators/box.py b/boxes/generators/box.py index 02c55c6..72feb30 100755 --- a/boxes/generators/box.py +++ b/boxes/generators/box.py @@ -22,7 +22,6 @@ class Box(Boxes): def __init__(self): Boxes.__init__(self) - self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0) self.buildArgParser("x", "y", "h", "outside") def render(self): diff --git a/boxes/generators/box2.py b/boxes/generators/box2.py index fc186fe..bf0e034 100755 --- a/boxes/generators/box2.py +++ b/boxes/generators/box2.py @@ -23,7 +23,6 @@ class Box2(Boxes): def __init__(self): Boxes.__init__(self) - self.addSettingsArgs(edges.FingerJointSettings, finger=3, space=3) self.addSettingsArgs(edges.StackableSettings) self.addSettingsArgs(edges.HingeSettings) self.addSettingsArgs(edges.LidSettings) diff --git a/boxes/generators/box3.py b/boxes/generators/box3.py index e7617c2..57f06f0 100755 --- a/boxes/generators/box3.py +++ b/boxes/generators/box3.py @@ -22,7 +22,6 @@ class Box3(Boxes): def __init__(self): Boxes.__init__(self) self.buildArgParser("x", "y", "h", "outside") - self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0) def render(self): x, y, h = self.x, self.y, self.h diff --git a/boxes/generators/magazinefile.py b/boxes/generators/magazinefile.py index 53ef32e..84a1495 100755 --- a/boxes/generators/magazinefile.py +++ b/boxes/generators/magazinefile.py @@ -23,7 +23,6 @@ class MagazinFile(Boxes): def __init__(self): Boxes.__init__(self) self.buildArgParser("x", "y", "h", "hi", "outside") - self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0) def side(self, w, h, hi): r = min(h - hi, w) / 2.0 diff --git a/boxes/generators/regularbox.py b/boxes/generators/regularbox.py index f1833ff..50cd91e 100644 --- a/boxes/generators/regularbox.py +++ b/boxes/generators/regularbox.py @@ -22,7 +22,6 @@ class RegularBox(Boxes): def __init__(self): Boxes.__init__(self) - self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0) self.buildArgParser("h", "outside") self.argparser.add_argument( "--radius", action="store", type=float, default=50.0, @@ -51,7 +50,7 @@ class RegularBox(Boxes): t = self.thickness - edges.FingerJointSettings(self.thickness, True, angle=360./n, finger=2, space=2).edgeObjects(self, chars="gGH") + edges.FingerJointSettings(self.thickness, True, angle=360./n).edgeObjects(self, chars="gGH") r, sh, side = self.regularPolygon(n, radius=r) diff --git a/boxes/generators/roundedbox.py b/boxes/generators/roundedbox.py index ad38a8f..17d85d5 100644 --- a/boxes/generators/roundedbox.py +++ b/boxes/generators/roundedbox.py @@ -22,7 +22,6 @@ class RoundedBox(Boxes): def __init__(self): Boxes.__init__(self) - self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0) self.buildArgParser("x", "y", "h", "outside") self.argparser.add_argument( "--radius", action="store", type=float, default=15, diff --git a/boxes/generators/typetray.py b/boxes/generators/typetray.py index 23a07c9..567a395 100755 --- a/boxes/generators/typetray.py +++ b/boxes/generators/typetray.py @@ -23,8 +23,7 @@ class TypeTray(Boxes): def __init__(self): Boxes.__init__(self) self.buildArgParser("sx", "sy", "h", "hi", "outside") - self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0, - surroundingspaces=0.5) + self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5) self.argparser.add_argument( "--gripheight", action="store", type=float, default=30, dest="gh", help="height of the grip hole in mm")