diff --git a/svggen/builders/CatBuilder.py b/svggen/builders/CatBuilder.py index dabbc357ef6043f8a2cf5e984c78eaa4cf2527a0..3bf7f3f876c392842f1456b84e54c508bd4562ed 100644 --- a/svggen/builders/CatBuilder.py +++ b/svggen/builders/CatBuilder.py @@ -9,13 +9,13 @@ c.addSubcomponent("port","BoatBase") c.addSubcomponent("star","BoatBase") c.addConstraint(("port","length"), ("length", "depth"), "sum(x)") -c.addConstraint(("port","width"), "width", "x/8.") +c.addConstraint(("port","width"), "width", "x/4.") c.addConstraint(("port","depth"), ("length", "depth"), "sum(x)/20.") c.addConstraint(("port","bow"), "length", "x/2.") c.addConstraint(("port","stern"), "length", "x/8.") c.addConstraint(("star","length"), ("length", "depth"), "sum(x)") -c.addConstraint(("star","width"), "width", "x/8.") +c.addConstraint(("star","width"), "width", "x/4.") c.addConstraint(("star","depth"), ("length", "depth"), "sum(x)/20.") c.addConstraint(("star","bow"), "length", "x/2.") c.addConstraint(("star","stern"), "length", "x/8.") diff --git a/svggen/builders/CatFoilBuilder.py b/svggen/builders/CatFoilBuilder.py index 1f05d7b40f7193dbec636a23704c98def052b898..ac6350489abae0b5c110edff77795bdf0dc709ea 100644 --- a/svggen/builders/CatFoilBuilder.py +++ b/svggen/builders/CatFoilBuilder.py @@ -10,11 +10,11 @@ c.addSubcomponent("star","Foil", inherit=True, prefix=None) c.delParameter("flip") -c.addConstraint(("port","width"), "width", "x*3./8.") +c.addConstraint(("port","width"), "width", "x/4.") c.addConstraint(("port","height"), ("length", "depth"), "sum(x)/3.") c.addConstConstraint(("port","flip"), True) -c.addConstraint(("star","width"), "width", "x*3./8.") +c.addConstraint(("star","width"), "width", "x/4.") c.addConstraint(("star","height"), ("length", "depth"), "sum(x)/3.") c.addConstConstraint(("star","flip"), False) diff --git a/svggen/library/CatFoil.yaml b/svggen/library/CatFoil.yaml index d9014e3dc26dce0d705e64e38da9547783bb3cee..0873e5329cec49ed66e9fe7a7f959fb52803847e 100644 --- a/svggen/library/CatFoil.yaml +++ b/svggen/library/CatFoil.yaml @@ -39,7 +39,7 @@ subcomponents: function: sum(x)/3. parameter: [length, depth] length: {parameter: length} - width: {function: x*3./8., parameter: width} + width: {function: x/4., parameter: width} star: classname: Foil kwargs: {} @@ -51,4 +51,4 @@ subcomponents: function: sum(x)/3. parameter: [length, depth] length: {parameter: length} - width: {function: x*3./8., parameter: width} + width: {function: x/4., parameter: width} diff --git a/svggen/library/Catamaran.yaml b/svggen/library/Catamaran.yaml index ebcc0e698850b0edb392d66dfa676eac096c664a..7ae7b5d910ad15d0d67dad7404ac98c59e6b1288 100644 --- a/svggen/library/Catamaran.yaml +++ b/svggen/library/Catamaran.yaml @@ -39,7 +39,7 @@ subcomponents: function: sum(x) parameter: [length, depth] stern: {function: x/8., parameter: length} - width: {function: x/8., parameter: width} + width: {function: x/4., parameter: width} star: classname: BoatBase kwargs: {} @@ -52,4 +52,4 @@ subcomponents: function: sum(x) parameter: [length, depth] stern: {function: x/8., parameter: length} - width: {function: x/8., parameter: width} + width: {function: x/4., parameter: width}