From a97dcbe8b15e1f0a1df418e61f774dfe6ad51afa Mon Sep 17 00:00:00 2001 From: anna-puk <100537439+anna-puk@users.noreply.github.com> Date: Mon, 4 Jul 2022 22:30:19 +0200 Subject: [PATCH 1/5] update index.js files to draft all parts (elastic, front2, back2 and gusset2 are copied from ursula without any modifications) --- designs/unice/config/index.js | 6 +++++- designs/unice/src/index.js | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/designs/unice/config/index.js b/designs/unice/config/index.js index 30cd7e36fd1..a6a2892f399 100644 --- a/designs/unice/config/index.js +++ b/designs/unice/config/index.js @@ -15,7 +15,7 @@ const config = { gusset: 'ursulaGusset', }, hide: ['ursulaBack', 'ursulaFront', 'ursulaGusset'], - parts: [], + parts: ['front','back','gusset','elastic','front2','back2','gusset2'], optionalMeasurements: ['crossSeam','crossSeamFront'], measurements: ['waist', 'seat', 'waistToSeat', 'waistToUpperLeg','hips','waistToHips'], optionGroups: { @@ -33,6 +33,10 @@ const config = { dependencies: { back: 'front', gusset: 'back', + elastic: 'gusset', + front2: 'elastic', + back2: 'elastic', + gusset2: 'elastic', }, options: { ...ursulaConfig.options, diff --git a/designs/unice/src/index.js b/designs/unice/src/index.js index e1044cc78f9..e4f33f50dcc 100644 --- a/designs/unice/src/index.js +++ b/designs/unice/src/index.js @@ -20,6 +20,16 @@ for (const name of ['Back', 'Front', 'Gusset']) { Unice.prototype.draftElastic = function (part) { return new Ursula(this.settings).draftElastic(part) } +Unice.prototype.draftFront2 = function (part) { + return new Ursula(this.settings).draftFront2(part) +} +Unice.prototype.draftBack2 = function (part) { + return new Ursula(this.settings).draftBack2(part) +} +Unice.prototype.draftGusset2 = function (part) { + return new Ursula(this.settings).draftGusset2(part) +} + // Attach our own draft methods to the prototype Unice.prototype.draftFront = draftFront From 5d3463b10471531bfc5e6ca5808f29d674441f44 Mon Sep 17 00:00:00 2001 From: anna-puk <100537439+anna-puk@users.noreply.github.com> Date: Mon, 4 Jul 2022 22:57:46 +0200 Subject: [PATCH 2/5] On ursula-add-markers-for-elastic-(retry): path lengths for back --- designs/unice/src/back.js | 27 +++++++++------------------ designs/unice/src/front.js | 23 ++++++++++++----------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/designs/unice/src/back.js b/designs/unice/src/back.js index 0f97c2b694b..b271747b41e 100644 --- a/designs/unice/src/back.js +++ b/designs/unice/src/back.js @@ -179,32 +179,23 @@ return part /* Store lengths for use in elastic */ - if (options.backExposure >= 0) { - store.set( - 'backLegOpeningLength', - new Path() + paths.backLegOpening = (options.backExposure >= 0) + ? new Path() .move(points.backGussetRight) .curve(points.backGussetRightCp1, points.backLegOpeningRightCp1, points.backLegOpeningRight) - .length() - ) - } else { - store.set( - 'backLegOpeningLength', - new Path() + .setRender(false) + : new Path() .move(points.backGussetRight) .curve(points.backGussetRightCp1, points.backFlareRightCp2, points.backFlareRight) .curve(points.backFlareRightCp1, points.backLegOpeningRightCp1, points.backLegOpeningRight) - .length() - ) - } + .setRender(false) + store.set('backLegOpeningLength',paths.backLegOpening.length()) - store.set( - 'backWaistBandLength', - new Path() + paths.backWaistBand = new Path() .move(points.backWaistBandRight) .curve(points.backWaistBandRightCp1, points.backWaistBandLeftCp1, points.backWaistBandLeft) - .length() - ) + .setRender(false) + store.set('backWaistBandLength',paths.backWaistBand.length()) // Complete? if (complete) { diff --git a/designs/unice/src/front.js b/designs/unice/src/front.js index 2a4bc075283..75dd42b7c86 100644 --- a/designs/unice/src/front.js +++ b/designs/unice/src/front.js @@ -202,24 +202,25 @@ export default function (part) { /* Store lengths for use in elastic */ - store.set( - 'frontLegOpeningLength', - new Path() + paths.frontLegOpening = new Path() .move(points.frontGussetRight) .curve( points.frontGussetRightCp1, points.frontLegOpeningRightCp1, points.frontLegOpeningRight ) - .length() - ) - store.set( - 'frontWaistBandLength', - new Path() + .setRender(false) + store.set('frontLegOpeningLength',paths.frontLegOpening.length()) + + paths.frontWaistBand = new Path() .move(points.frontWaistBandRight) - .curve(points.frontWaistBandRightCp1, points.frontWaistBandLeftCp1, points.frontWaistBandLeft) - .length() - ) + .curve( + points.frontWaistBandRightCp1, + points.frontWaistBandLeftCp1, + points.frontWaistBandLeft + ) + .setRender(false) + store.set('frontWaistBandLength',paths.frontWaistBand.length()) // Complete? if (complete) { From c4a0cb6692e191e2e8f0f3406047a8f59798e393 Mon Sep 17 00:00:00 2001 From: anna-puk <100537439+anna-puk@users.noreply.github.com> Date: Mon, 4 Jul 2022 23:20:41 +0200 Subject: [PATCH 3/5] store path length for gusset --- designs/unice/src/gusset.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/designs/unice/src/gusset.js b/designs/unice/src/gusset.js index 8b1a9a37b31..b4860a01cdc 100644 --- a/designs/unice/src/gusset.js +++ b/designs/unice/src/gusset.js @@ -29,13 +29,11 @@ return part points.frontMidMid = points.gussetCp1.shiftFractionTowards(points.gussetCp2, 0.5) /* Store lengths for use in elastic */ - store.set( - 'gussetSideLength', - new Path() - .move(points.backGussetRight) - .curve(points.backGussetRight, points.gussetCp2, points.frontGussetRight) - .length() - ) + paths.gussetLegOpening = new Path() + .move(points.backGussetRight) + .curve(points.backGussetRight, points.gussetCp2, points.frontGussetRight) + .setRender(false) + store.set('gussetSideLength', paths.gussetLegOpening.length()) // Draw paths paths.seam = new Path() From 5aaaf7b933802834fb899a6ffd511cbf8d82516d Mon Sep 17 00:00:00 2001 From: anna-puk <100537439+anna-puk@users.noreply.github.com> Date: Tue, 5 Jul 2022 14:41:11 +0200 Subject: [PATCH 4/5] update index.js inject and hide front, back and gusset parts --- designs/unice/config/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designs/unice/config/index.js b/designs/unice/config/index.js index a6a2892f399..af39af98d28 100644 --- a/designs/unice/config/index.js +++ b/designs/unice/config/index.js @@ -13,8 +13,11 @@ const config = { front: 'ursulaFront', back: 'ursulaBack', gusset: 'ursulaGusset', + front2: 'front', + back2: 'back', + gusset2: 'gusset', }, - hide: ['ursulaBack', 'ursulaFront', 'ursulaGusset'], + hide: ['ursulaBack', 'ursulaFront', 'ursulaGusset','front', 'back', 'gusset'], parts: ['front','back','gusset','elastic','front2','back2','gusset2'], optionalMeasurements: ['crossSeam','crossSeamFront'], measurements: ['waist', 'seat', 'waistToSeat', 'waistToUpperLeg','hips','waistToHips'], From d792bdcd9c7e74f08a1ecbff7741a9218f9bdb0b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 10 Jul 2022 18:08:33 +0200 Subject: [PATCH 5/5] chore: Updated changelog --- config/changelog.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/changelog.yaml b/config/changelog.yaml index 6e2331ab546..f2d7b99b187 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -5,6 +5,8 @@ Unreleased: hugo: - Support drafting for high bust Closes [#802](https://github.com/freesewing/freesewing/issues/802) + plugin-title: + - Added support for removing the title via a macro call Changed: charlie: