From e846f2516cb21d33ffc5df77b7576ed762dea25f Mon Sep 17 00:00:00 2001
From: bobgeorgethe3rd <bobgeorgethe3rd@googlemail.com>
Date: Mon, 16 Sep 2024 13:35:01 +0100
Subject: [PATCH] Revert "fix(sandy): fix seam allowance construction to work
 with new ringsector changes"

---
 designs/sandy/src/skirt.mjs         |  8 ++++++--
 designs/tristan/src/peplumFront.mjs | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/designs/sandy/src/skirt.mjs b/designs/sandy/src/skirt.mjs
index 1c1b90e2964..e01a07738c6 100644
--- a/designs/sandy/src/skirt.mjs
+++ b/designs/sandy/src/skirt.mjs
@@ -113,9 +113,13 @@ function sandySkirt({
   if (sa) {
     paths.hemBase = new Path()
       .move(points.ex2Flipped)
-      .circleSegment(angle, points.center)
+      .curve(points.ex2cFlipped, points.ex1cFlipped, points.ex1)
+      .curve(points.ex1c, points.ex2c, points.ex2)
       .offset(store.get('fullLength') * options.lengthBonus * options.hemWidth)
-    paths.saBase = new Path().move(points.in2).circleSegment(-angle, points.center)
+    paths.saBase = new Path()
+      .move(points.in2)
+      .curve(points.in2c, points.in1c, points.in1)
+      .curve(points.in1cFlipped, points.in2cFlipped, points.in2Flipped)
 
     if (!options.seamlessFullCircle)
       paths.saBase = new Path().move(points.ex2).line(points.ex2).join(paths.saBase)
diff --git a/designs/tristan/src/peplumFront.mjs b/designs/tristan/src/peplumFront.mjs
index 2f7a324463b..ec98a96a89a 100644
--- a/designs/tristan/src/peplumFront.mjs
+++ b/designs/tristan/src/peplumFront.mjs
@@ -17,10 +17,9 @@ export const CreateShape = ({
   const double =
     type == options.zipperLocation || (true == options.lacing && type == options.lacingLocation)
 
-  const angle = (options.peplumFullness / 2) * ratio * (double ? 0.5 : 1)
   macro('ringsector', {
     id: type + 'Peblum',
-    angle: angle,
+    angle: (options.peplumFullness / 2) * ratio * (double ? 0.5 : 1),
     insideRadius: radius,
     outsideRadius: radius + width,
     rotate: false,
@@ -53,9 +52,27 @@ export const CreateShape = ({
       .join(
         new Path()
           .move(points['__macro_ringsector_' + type + 'Peblum_ex2Flipped'])
-          .circleSegment(angle, points['__macro_ringsector_' + type + 'Peblum_center'])
+          .curve(
+            points['__macro_ringsector_' + type + 'Peblum_ex2cFlipped'],
+            points['__macro_ringsector_' + type + 'Peblum_ex1cFlipped'],
+            points['__macro_ringsector_' + type + 'Peblum_ex1']
+          )
+          .curve(
+            points['__macro_ringsector_' + type + 'Peblum_ex1c'],
+            points['__macro_ringsector_' + type + 'Peblum_ex2c'],
+            points['__macro_ringsector_' + type + 'Peblum_ex2']
+          )
           .line(points['__macro_ringsector_' + type + 'Peblum_in2'])
-          .circleSegment(-angle, points['__macro_ringsector_' + type + 'Peblum_center'])
+          .curve(
+            points['__macro_ringsector_' + type + 'Peblum_in2c'],
+            points['__macro_ringsector_' + type + 'Peblum_in1c'],
+            points['__macro_ringsector_' + type + 'Peblum_in1']
+          )
+          .curve(
+            points['__macro_ringsector_' + type + 'Peblum_in1cFlipped'],
+            points['__macro_ringsector_' + type + 'Peblum_in2cFlipped'],
+            points['__macro_ringsector_' + type + 'Peblum_in2Flipped']
+          )
           .offset(sa)
       )
       .line(points['__macro_ringsector_' + type + 'Peblum_in2Flipped'])