From 1f1b5be2fe8b57894031fdd52692dd36d3d2e534 Mon Sep 17 00:00:00 2001 From: Benjamin F Date: Sun, 7 Aug 2022 07:48:26 -0700 Subject: [PATCH 1/2] Remove seam allowance from Part1a foldline. --- CHANGELOG.md | 12 +++++++++--- config/changelog.yaml | 3 +++ designs/cathrin/src/panel1ab.js | 15 +++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e73f806515..48617772d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## Unreleased +### aaron + +#### Added + + - Support drafting for high bust + ### breanna #### Fixed @@ -15,11 +21,11 @@ - Make s3 options sticky to zero below 10% to avoid path split issues. Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249) -### aaron +### cathrin -#### Added +#### Fixed - - Support drafting for high bust + - Removed seam allowance from Part1a foldline. Fixes [#2545](https://github.com/freesewing/freesewing/issues/2545) ### charlie diff --git a/config/changelog.yaml b/config/changelog.yaml index b453c5242f8..d6795381478 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -24,6 +24,9 @@ Unreleased: brian: - Make s3 options sticky to zero below 10% to avoid path split issues. Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249) + cathrin: + - Removed seam allowance from Part1a foldline. + Fixes [#2545](https://github.com/freesewing/freesewing/issues/2545) simon: - Fix issue with boxPleat and yoke Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400) diff --git a/designs/cathrin/src/panel1ab.js b/designs/cathrin/src/panel1ab.js index 10a3925bf3e..89eb5ba9b0b 100644 --- a/designs/cathrin/src/panel1ab.js +++ b/designs/cathrin/src/panel1ab.js @@ -12,13 +12,16 @@ export default function (part) { .curve(paths.panel1.ops[1].cp1, paths.panel1.ops[1].cp2, paths.panel1.ops[1].to) points.bottomABsplit = bottom.shiftFractionAlong(0.3) - paths.panel1a = bottom - .split(points.bottomABsplit)[0] + paths.panel1a_nonfold = new Path() + .move(points.bottomCF) + .join(bottom.split(points.bottomABsplit)[0]) .line(points.topABsplit) .join(top.split(points.topABsplit)[1]) - .line(points.bottomCF) + .setRender(false) + paths.panel1a = paths.panel1a_nonfold.clone() .close() .attr('class', 'fabric') + .setRender(true) paths.panel1b = bottom .split(points.bottomABsplit)[1] .curve(points.hipsGap1Cp, points.waistGap1LeftCp1, points.waistGap1Left) @@ -35,7 +38,11 @@ export default function (part) { // Complete pattern? if (complete) { if (sa) { - paths.saA = paths.panel1a.offset(sa).attr('class', 'fabric sa') + paths.saA = paths.panel1a_nonfold.offset(sa).attr('class', 'fabric sa') + paths.saA + .line(points.topCF) + .move(points.bottomCF) + .line(paths.saA.start()) paths.saB = paths.panel1b.offset(sa).attr('class', 'fabric sa') } macro('cutonfold', { From 6ca93210667181d4a8a646008c76b61e916e454a Mon Sep 17 00:00:00 2001 From: Benjamin F Date: Sun, 7 Aug 2022 07:48:26 -0700 Subject: [PATCH 2/2] Remove seam allowance from Part1a foldline. --- CHANGELOG.md | 12 +++++++++--- config/changelog.yaml | 3 +++ designs/cathrin/src/panel1ab.js | 15 +++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e73f806515..48617772d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## Unreleased +### aaron + +#### Added + + - Support drafting for high bust + ### breanna #### Fixed @@ -15,11 +21,11 @@ - Make s3 options sticky to zero below 10% to avoid path split issues. Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249) -### aaron +### cathrin -#### Added +#### Fixed - - Support drafting for high bust + - Removed seam allowance from Part1a foldline. Fixes [#2545](https://github.com/freesewing/freesewing/issues/2545) ### charlie diff --git a/config/changelog.yaml b/config/changelog.yaml index b453c5242f8..d6795381478 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -24,6 +24,9 @@ Unreleased: brian: - Make s3 options sticky to zero below 10% to avoid path split issues. Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249) + cathrin: + - Removed seam allowance from Part1a foldline. + Fixes [#2545](https://github.com/freesewing/freesewing/issues/2545) simon: - Fix issue with boxPleat and yoke Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400) diff --git a/designs/cathrin/src/panel1ab.js b/designs/cathrin/src/panel1ab.js index 10a3925bf3e..89eb5ba9b0b 100644 --- a/designs/cathrin/src/panel1ab.js +++ b/designs/cathrin/src/panel1ab.js @@ -12,13 +12,16 @@ export default function (part) { .curve(paths.panel1.ops[1].cp1, paths.panel1.ops[1].cp2, paths.panel1.ops[1].to) points.bottomABsplit = bottom.shiftFractionAlong(0.3) - paths.panel1a = bottom - .split(points.bottomABsplit)[0] + paths.panel1a_nonfold = new Path() + .move(points.bottomCF) + .join(bottom.split(points.bottomABsplit)[0]) .line(points.topABsplit) .join(top.split(points.topABsplit)[1]) - .line(points.bottomCF) + .setRender(false) + paths.panel1a = paths.panel1a_nonfold.clone() .close() .attr('class', 'fabric') + .setRender(true) paths.panel1b = bottom .split(points.bottomABsplit)[1] .curve(points.hipsGap1Cp, points.waistGap1LeftCp1, points.waistGap1Left) @@ -35,7 +38,11 @@ export default function (part) { // Complete pattern? if (complete) { if (sa) { - paths.saA = paths.panel1a.offset(sa).attr('class', 'fabric sa') + paths.saA = paths.panel1a_nonfold.offset(sa).attr('class', 'fabric sa') + paths.saA + .line(points.topCF) + .move(points.bottomCF) + .line(paths.saA.start()) paths.saB = paths.panel1b.offset(sa).attr('class', 'fabric sa') } macro('cutonfold', {