diff --git a/packages/hugo/config/index.js b/packages/hugo/config/index.js index 3da379c58f5..877ebd415ec 100644 --- a/packages/hugo/config/index.js +++ b/packages/hugo/config/index.js @@ -15,17 +15,17 @@ export default { advanced: ['acrossBackFactor', 'backNeckCutout'] }, measurements: [ - 'bicepsCircumference', - 'chestCircumference', - 'headCircumference', - 'hipsCircumference', + 'biceps', + 'chest', + 'head', + 'hips', 'hpsToWaistBack', 'waistToHips', - 'neckCircumference', + 'neck', 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wristCircumference' + 'wrist' ], parts: ['waistband', 'cuff'], dependencies: { diff --git a/packages/hugo/src/back.js b/packages/hugo/src/back.js index a905da4ba2e..a5cb87fb111 100644 --- a/packages/hugo/src/back.js +++ b/packages/hugo/src/back.js @@ -22,7 +22,7 @@ export default function (part) { } = part.shorthand() // Fit the hips - points.hem.x = (measurements.hipsCircumference * (1 + options.hipsEase)) / 4 + points.hem.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hemCp2 = new Point(points.hem.x, points.cbWaist.y) // Ribbing diff --git a/packages/hugo/src/cuff.js b/packages/hugo/src/cuff.js index 45020fee7bb..7d9cd436fbd 100644 --- a/packages/hugo/src/cuff.js +++ b/packages/hugo/src/cuff.js @@ -13,8 +13,7 @@ export default function (part) { } = part.shorthand() let width = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight * 2 - let length = - measurements.wristCircumference * (1 + options.cuffEase) * (1 - options.ribbingStretch) + let length = measurements.wrist * (1 + options.cuffEase) * (1 - options.ribbingStretch) points.topLeft = new Point(0, 0) points.bottomLeft = new Point(0, width) diff --git a/packages/hugo/src/front.js b/packages/hugo/src/front.js index c7751eb3cd3..805531cdd33 100644 --- a/packages/hugo/src/front.js +++ b/packages/hugo/src/front.js @@ -23,7 +23,7 @@ export default function (part) { } = part.shorthand() // Fit the hips - points.hem.x = (measurements.hipsCircumference * (1 + options.hipsEase)) / 4 + points.hem.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hemCp2 = new Point(points.hem.x, points.cfWaist.y) // Absolute values for percentages diff --git a/packages/hugo/src/hoodside.js b/packages/hugo/src/hoodside.js index 0e49885c305..ea0e00af0ed 100644 --- a/packages/hugo/src/hoodside.js +++ b/packages/hugo/src/hoodside.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, sa, @@ -16,9 +16,9 @@ export default function(part) { } = part.shorthand() let neckOpening = store.get('neckOpeningLenFront') + store.get('neckOpeningLenBack') - let hoodOpening = measurements.headCircumference + let hoodOpening = measurements.head let neckCutoutDelta = store.get('neckCutoutFront') - store.get('neckCutoutBack') - store.set('hoodCenterWidth', measurements.headCircumference / 10) + store.set('hoodCenterWidth', measurements.head / 10) let halfCenterPanel = store.get('hoodCenterWidth') / 2 points.topLeft = new Point(0, 0) points.topRight = new Point(neckOpening, 0) diff --git a/packages/hugo/src/waistband.js b/packages/hugo/src/waistband.js index c5ffc79438c..31c2e2d9e81 100644 --- a/packages/hugo/src/waistband.js +++ b/packages/hugo/src/waistband.js @@ -16,7 +16,7 @@ export default function (part) { let width = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight * 2 let length = complete ? width * 2.5 - : measurements.chestCircumference * (1 + options.chestEase) * (1 - options.ribbingStretch) + : measurements.chest * (1 + options.chestEase) * (1 - options.ribbingStretch) // We only print a part, unless complete is false in which case // we print the entire thing (because laser cutters and so on) @@ -73,9 +73,7 @@ export default function (part) { from: points.bottomLeft, to: points.bottomRight, y: points.bottomRight.y + sa + 15, - text: units( - measurements.chestCircumference * (1 + options.chestEase) * (1 - options.ribbingStretch) - ) + text: units(measurements.chest * (1 + options.chestEase) * (1 - options.ribbingStretch)) }) }