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

Use default finger/width settings of 2.0 for every box

This commit is contained in:
christopher 2017-01-30 09:55:44 +01:00 committed by Florian Festi
parent c36d819e10
commit 8d754c3855
10 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boxes/edges.py
View File

@ -514,8 +514,8 @@ Values:
relative_params = { relative_params = {
"space": 1.0, "space": 1.0,
"finger": 1.0, "finger": 2.0,
"width": 1.0, "width": 2.0,
"edge_width": 1.0, "edge_width": 1.0,
"play" : 0.0, "play" : 0.0,
} }

3
boxes/generators/angledbox.py
View File

@ -22,7 +22,6 @@ class AngledBox(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0)
self.buildArgParser("x", "y", "h", "outside") self.buildArgParser("x", "y", "h", "outside")
self.argparser.add_argument( self.argparser.add_argument(
"--n", action="store", type=int, default=5, "--n", action="store", type=int, default=5,
@ -100,7 +99,7 @@ class AngledBox(Boxes):
else: else:
lx = x - 2 * r + side 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() self.ctx.save()

3
boxes/generators/bintray.py
View File

@ -49,8 +49,7 @@ class BinTray(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.buildArgParser("sx", "sy", "h", "outside") self.buildArgParser("sx", "sy", "h", "outside")
self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0, self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5)
surroundingspaces=0.5)
self.argparser.add_argument( self.argparser.add_argument(
"--front", action="store", type=float, default=0.4, "--front", action="store", type=float, default=0.4,
help="fraction of bin height covert with slope") help="fraction of bin height covert with slope")

1
boxes/generators/box.py
View File

@ -22,7 +22,6 @@ class Box(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0)
self.buildArgParser("x", "y", "h", "outside") self.buildArgParser("x", "y", "h", "outside")
def render(self): def render(self):

1
boxes/generators/box2.py
View File

@ -23,7 +23,6 @@ class Box2(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings, finger=3, space=3)
self.addSettingsArgs(edges.StackableSettings) self.addSettingsArgs(edges.StackableSettings)
self.addSettingsArgs(edges.HingeSettings) self.addSettingsArgs(edges.HingeSettings)
self.addSettingsArgs(edges.LidSettings) self.addSettingsArgs(edges.LidSettings)

1
boxes/generators/box3.py
View File

@ -22,7 +22,6 @@ class Box3(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.buildArgParser("x", "y", "h", "outside") self.buildArgParser("x", "y", "h", "outside")
self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0)
def render(self): def render(self):
x, y, h = self.x, self.y, self.h x, y, h = self.x, self.y, self.h

1
boxes/generators/magazinefile.py
View File

@ -23,7 +23,6 @@ class MagazinFile(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.buildArgParser("x", "y", "h", "hi", "outside") self.buildArgParser("x", "y", "h", "hi", "outside")
self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0)
def side(self, w, h, hi): def side(self, w, h, hi):
r = min(h - hi, w) / 2.0 r = min(h - hi, w) / 2.0

3
boxes/generators/regularbox.py
View File

@ -22,7 +22,6 @@ class RegularBox(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings, finger=2.0, space=2.0)
self.buildArgParser("h", "outside") self.buildArgParser("h", "outside")
self.argparser.add_argument( self.argparser.add_argument(
"--radius", action="store", type=float, default=50.0, "--radius", action="store", type=float, default=50.0,
@ -51,7 +50,7 @@ class RegularBox(Boxes):
t = self.thickness 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) r, sh, side = self.regularPolygon(n, radius=r)

1
boxes/generators/roundedbox.py
View File

@ -22,7 +22,6 @@ class RoundedBox(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0)
self.buildArgParser("x", "y", "h", "outside") self.buildArgParser("x", "y", "h", "outside")
self.argparser.add_argument( self.argparser.add_argument(
"--radius", action="store", type=float, default=15, "--radius", action="store", type=float, default=15,

3
boxes/generators/typetray.py
View File

@ -23,8 +23,7 @@ class TypeTray(Boxes):
def __init__(self): def __init__(self):
Boxes.__init__(self) Boxes.__init__(self)
self.buildArgParser("sx", "sy", "h", "hi", "outside") self.buildArgParser("sx", "sy", "h", "hi", "outside")
self.addSettingsArgs(edges.FingerJointSettings, finger=3.0, space=3.0, self.addSettingsArgs(edges.FingerJointSettings, surroundingspaces=0.5)
surroundingspaces=0.5)
self.argparser.add_argument( self.argparser.add_argument(
"--gripheight", action="store", type=float, default=30, "--gripheight", action="store", type=float, default=30,
dest="gh", help="height of the grip hole in mm") dest="gh", help="height of the grip hole in mm")