From d0356a12a3a176b73097eab78cd49861eaf80c45 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Fri, 11 Jan 2019 21:28:38 +0100 Subject: [PATCH] Add parameters to addTopEdgeSettings() for changed defaults --- boxes/generators/typetray.py | 3 ++- boxes/generators/universalbox.py | 2 +- boxes/lids.py | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/boxes/generators/typetray.py b/boxes/generators/typetray.py index ef51b1c..d84411b 100644 --- a/boxes/generators/typetray.py +++ b/boxes/generators/typetray.py @@ -24,7 +24,8 @@ class TypeTray(_TopEdge): def __init__(self): Boxes.__init__(self) - self.addTopEdgeSettings() + self.addTopEdgeSettings(fingerjoint={"surroundingspaces": 0.5}, + roundedtriangle={"outset" : 1}) self.buildArgParser("sx", "sy", "h", "hi", "outside", "bottom_edge", "top_edge") self.argparser.add_argument( diff --git a/boxes/generators/universalbox.py b/boxes/generators/universalbox.py index 0f37184..9d5f04d 100644 --- a/boxes/generators/universalbox.py +++ b/boxes/generators/universalbox.py @@ -25,7 +25,7 @@ class UniversalBox(_TopEdge, _ChestLid): def __init__(self): Boxes.__init__(self) - self.addTopEdgeSettings() + self.addTopEdgeSettings(roundedtriangle={"outset" : 1}) self.addSettingsArgs(edges.FlexSettings) self.buildArgParser("top_edge", "bottom_edge", "x", "y", "h") self.argparser.add_argument( diff --git a/boxes/lids.py b/boxes/lids.py index c0ee2e4..f97e641 100644 --- a/boxes/lids.py +++ b/boxes/lids.py @@ -90,14 +90,16 @@ class _ChestLid(Boxes): 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) - self.addSettingsArgs(edges.RoundedTriangleEdgeSettings) + def addTopEdgeSettings(self, fingerjoint={}, stackable={}, hinge={}, + cabinethinge={}, lid={}, click={}, + roundedtriangle={}): + self.addSettingsArgs(edges.FingerJointSettings, **fingerjoint) + self.addSettingsArgs(edges.StackableSettings, **stackable) + self.addSettingsArgs(edges.HingeSettings, **hinge) + self.addSettingsArgs(edges.CabinetHingeSettings, **cabinethinge) + self.addSettingsArgs(edges.LidSettings, **lid) + self.addSettingsArgs(edges.ClickSettings, **click) + self.addSettingsArgs(edges.RoundedTriangleEdgeSettings, **roundedtriangle) def topEdges(self, top_edge): t1 = t2 = t3 = t4 = self.edges.get(top_edge, self.edges["e"])