From 9131c3496d5feb1d49fdb6c8f63dd2ffc1ab72f8 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 11 Sep 2022 14:02:00 +0200 Subject: [PATCH] chore(cornelius): Port to v3 stage 2 --- designs/cornelius/src/back.mjs | 18 +++++++++--- designs/cornelius/src/front.mjs | 20 +++++++++---- designs/cornelius/src/frontpoints.mjs | 14 +++++++-- designs/cornelius/src/index.mjs | 15 ++++++---- designs/cornelius/src/legband.mjs | 36 +++++++++++------------ designs/cornelius/src/legbandkeystone.mjs | 35 +++++++++++----------- designs/cornelius/src/pocket.mjs | 17 ++++++++--- designs/cornelius/src/pocketfacing.mjs | 18 +++++++++--- designs/cornelius/src/waistband.mjs | 20 +++++++++---- designs/cornelius/src/zipperguard.mjs | 18 +++++++++--- 10 files changed, 139 insertions(+), 72 deletions(-) diff --git a/designs/cornelius/src/back.mjs b/designs/cornelius/src/back.mjs index e6fc49bf8d7..af320d5dd1c 100644 --- a/designs/cornelius/src/back.mjs +++ b/designs/cornelius/src/back.mjs @@ -175,10 +175,20 @@ function rotateDistanceForP4(part, point, distance, center, origin) { } } -function draftCorneliusBack (part) { - let { options, Path, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusBack({ + options, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { let tempP = null let waist = store.get('waist') diff --git a/designs/cornelius/src/front.mjs b/designs/cornelius/src/front.mjs index 0146353706f..2c8dd0f0438 100644 --- a/designs/cornelius/src/front.mjs +++ b/designs/cornelius/src/front.mjs @@ -1,10 +1,20 @@ import { pluginBundle } from '@freesewing/plugin-bundle' import { frontpoints } from './frontpoints.mjs' -function draftCorneliusFront (part) { - let { options, Path, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusFront({ + options, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { const cc = 0.551915024494 // circle constant let halfInch = store.get('halfInch') @@ -246,6 +256,6 @@ export const front = { pctKtoRup: 0.25, pctKtoH: 0.7, }, - plugins: [ pluginBundle ], + plugins: [pluginBundle], draft: draftCorneliusFront, } diff --git a/designs/cornelius/src/frontpoints.mjs b/designs/cornelius/src/frontpoints.mjs index b41ce242e25..ed483fe220e 100644 --- a/designs/cornelius/src/frontpoints.mjs +++ b/designs/cornelius/src/frontpoints.mjs @@ -1,6 +1,14 @@ -function draftCorneliusFrontpoints (part) { - let { options, measurements, Point, Path, points, paths, store, raise } = part.shorthand() - +function draftCorneliusFrontpoints({ + options, + measurements, + Point, + Path, + points, + paths, + store, + raise, + part, +}) { let halfInch = measurements.waistToKnee / 48 let inseam = measurements.inseam - (measurements.waistToFloor - measurements.waistToKnee) diff --git a/designs/cornelius/src/index.mjs b/designs/cornelius/src/index.mjs index f73d9e0b44f..9c9828b9d26 100644 --- a/designs/cornelius/src/index.mjs +++ b/designs/cornelius/src/index.mjs @@ -15,16 +15,19 @@ import { zipperguard } from './zipperguard.mjs' // Create new design const Cornelius = new Design({ data, - parts: [ - front, back, legband, legbandKeystone, waistband, pocketFacing, - pocket, zipperguard, - ] + parts: [front, back, legband, legbandKeystone, waistband, pocketFacing, pocket, zipperguard], }) // Named exports export { - front, back, legband, legbandKeystone, waistband, pocketFacing, - pocket, zipperguard, + front, + back, + legband, + legbandKeystone, + waistband, + pocketFacing, + pocket, + zipperguard, frontpoints, Cornelius, } diff --git a/designs/cornelius/src/legband.mjs b/designs/cornelius/src/legband.mjs index e96c02ae5a5..e27f6cd3d9d 100644 --- a/designs/cornelius/src/legband.mjs +++ b/designs/cornelius/src/legband.mjs @@ -25,22 +25,21 @@ function findR(part, height, arcLength) { return a * (180 / Math.PI) } -function draftCorneliusLegband (part) { - let { - options, - Point, - Path, - points, - paths, - Snippet, - snippets, - complete, - sa, - store, - paperless, - macro, - } = part.shorthand() - +function draftCorneliusLegband({ + options, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { if (options.cuffStyle == 'keystone') { return part } @@ -193,12 +192,11 @@ function draftCorneliusLegband (part) { export const legband = { name: 'cornelius.legband', - after: [ back, front ], + after: [back, front], options: { kneeToBelow: { pct: 94, min: 85, max: 110, menu: 'advanced' }, cuffWidth: { pct: 0, min: -50, max: 150, menu: 'style' }, - cuffStyle: { dflt: 'elegant', - list: ['traditional', 'elegant', 'keystone'], menu: 'style' }, + cuffStyle: { dflt: 'elegant', list: ['traditional', 'elegant', 'keystone'], menu: 'style' }, }, draft: draftCorneliusLegband, } diff --git a/designs/cornelius/src/legbandkeystone.mjs b/designs/cornelius/src/legbandkeystone.mjs index ca5d6592931..ce3bfb3b13e 100644 --- a/designs/cornelius/src/legbandkeystone.mjs +++ b/designs/cornelius/src/legbandkeystone.mjs @@ -1,23 +1,22 @@ import { front } from './front.mjs' import { back } from './back.mjs' -function draftCorneliusLegbandKeystone (part) { - let { - options, - measurements, - Point, - Path, - points, - paths, - Snippet, - snippets, - complete, - sa, - store, - paperless, - macro, - } = part.shorthand() - +function draftCorneliusLegbandKeystone({ + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { if (options.cuffStyle != 'keystone') { return part } @@ -182,6 +181,6 @@ function draftCorneliusLegbandKeystone (part) { export const legbandKeystone = { name: 'cornelius.legbandKeystone', - after: [ back, front ], + after: [back, front], draft: draftCorneliusLegbandKeystone, } diff --git a/designs/cornelius/src/pocket.mjs b/designs/cornelius/src/pocket.mjs index 9117020b24e..e9cba9ffd3a 100644 --- a/designs/cornelius/src/pocket.mjs +++ b/designs/cornelius/src/pocket.mjs @@ -1,9 +1,18 @@ import { frontpoints } from './frontpoints.mjs' -function draftCorneliusPocket (part) { - let { Path, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusPocket({ + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { let halfInch = store.get('halfInch') paths.waistSeam = paths.waistSeam.split(points.pocketFacingTL)[0].setRender(false) diff --git a/designs/cornelius/src/pocketfacing.mjs b/designs/cornelius/src/pocketfacing.mjs index 7059d26c900..d1820e3536d 100644 --- a/designs/cornelius/src/pocketfacing.mjs +++ b/designs/cornelius/src/pocketfacing.mjs @@ -1,9 +1,19 @@ import { frontpoints } from './frontpoints.mjs' -function draftCorneliusPocketFacing (part) { - let { Path, Point, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusPocketFacing({ + Path, + Point, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { let halfInch = store.get('halfInch') let waist = store.get('waist') diff --git a/designs/cornelius/src/waistband.mjs b/designs/cornelius/src/waistband.mjs index 0844b8c80f2..0ef46ed4329 100644 --- a/designs/cornelius/src/waistband.mjs +++ b/designs/cornelius/src/waistband.mjs @@ -1,10 +1,20 @@ import { front } from './front.mjs' import { back } from './back.mjs' -function draftCorneliusWaistband (part) { - let { Point, Path, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusWaistband({ + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { let halfInch = store.get('halfInch') let waistLength = store.get('frontWaistLength') + store.get('backWaistLength') let flyWidth = store.get('flyWidth') @@ -77,6 +87,6 @@ function draftCorneliusWaistband (part) { export const waistband = { name: 'cornelius.waistband', - after: [ back, front ], + after: [back, front], draft: draftCorneliusWaistband, } diff --git a/designs/cornelius/src/zipperguard.mjs b/designs/cornelius/src/zipperguard.mjs index 611b615b89f..54c1e488b3c 100644 --- a/designs/cornelius/src/zipperguard.mjs +++ b/designs/cornelius/src/zipperguard.mjs @@ -1,9 +1,19 @@ import { front } from './front.mjs' -function draftCorneliusZipperguard (part) { - let { Point, Path, points, paths, Snippet, snippets, complete, sa, store, paperless, macro } = - part.shorthand() - +function draftCorneliusZipperguard({ + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + store, + paperless, + macro, + part, +}) { const cc = 0.551915024494 // circle constant let halfInch = store.get('halfInch')