diff --git a/packages/huey/config/index.js b/packages/huey/config/index.js index b160ddc2d21..176e38d1700 100644 --- a/packages/huey/config/index.js +++ b/packages/huey/config/index.js @@ -65,17 +65,17 @@ export default { ] }, measurements: [ - 'bicepsCircumference', - 'chestCircumference', - 'headCircumference', - 'hipsCircumference', + 'biceps', + 'chest', + 'head', + 'hips', 'hpsToWaistBack', 'waistToHips', - 'neckCircumference', + 'neck', 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wristCircumference' + 'wrist' ], dependencies: { backBase: 'base', diff --git a/packages/huey/src/back.js b/packages/huey/src/back.js index 49ef8a526f1..70927704742 100644 --- a/packages/huey/src/back.js +++ b/packages/huey/src/back.js @@ -26,7 +26,7 @@ export default function (part) { } // Shape side seam - points.hips.x = (measurements.hipsCircumference * (1 + options.hipsEase)) / 4 + points.hips.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hem.x = points.hips.x points.hemCp2 = new Point(points.hips.x, points.cbWaist.y) diff --git a/packages/huey/src/cuff.js b/packages/huey/src/cuff.js index d4a3523b941..d7f3766304d 100644 --- a/packages/huey/src/cuff.js +++ b/packages/huey/src/cuff.js @@ -1,13 +1,10 @@ import { draftRibbing } from './shared' -export default part => { +export default (part) => { let { complete, points, measurements, options, macro } = part.shorthand() if (!options.ribbing) return part - draftRibbing( - part, - measurements.wristCircumference * (1 + options.cuffEase) * (1 - options.ribbingStretch) - ) + draftRibbing(part, measurements.wrist * (1 + options.cuffEase) * (1 - options.ribbingStretch)) // Complete pattern? if (complete) { diff --git a/packages/huey/src/front.js b/packages/huey/src/front.js index ee24c57d627..433fa7e154a 100644 --- a/packages/huey/src/front.js +++ b/packages/huey/src/front.js @@ -24,7 +24,7 @@ export default function (part) { } // Shape side seam - points.hips.x = (measurements.hipsCircumference * (1 + options.hipsEase)) / 4 + points.hips.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hem.x = points.hips.x points.hemCp2 = new Point(points.hips.x, points.cfWaist.y) diff --git a/packages/huey/src/hood.js b/packages/huey/src/hood.js index 78b30bf30b3..97a4c433b0f 100644 --- a/packages/huey/src/hood.js +++ b/packages/huey/src/hood.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, macro, @@ -18,24 +18,18 @@ export default function(part) { let base = store.get('frontNeckSeamLength') + store.get('backNeckSeamLength') points.cfBottom = new Point(0, 0) points.cbBottom = points.cfBottom.shift(0, base).rotate(options.hoodAngle, points.cfBottom) - points.cfHeightLeft = points.cfBottom.shift( - 90, - measurements.headCircumference * options.hoodHeight - ) + points.cfHeightLeft = points.cfBottom.shift(90, measurements.head * options.hoodHeight) points.cfHeightRight = points.cfHeightLeft.shift(0, base) points.cfTop = points.cfBottom - .shift(90, measurements.headCircumference * options.hoodClosure) + .shift(90, measurements.head * options.hoodClosure) .rotate(options.hoodAngle, points.cfBottom) - points.frontTop = points.cfHeightLeft.shift( - 0, - measurements.headCircumference * options.hoodCutback - ) + points.frontTop = points.cfHeightLeft.shift(0, measurements.head * options.hoodCutback) points.frontTopCp2 = new Point(points.frontTop.x, points.cfTop.y) points.backPitch = new Point( - points.cbBottom.x + measurements.headCircumference * options.hoodDepth, + points.cbBottom.x + measurements.head * options.hoodDepth, points.cfHeightRight.y * 0.6 ) - points.backPitchCp1 = points.backPitch.shift(-90, measurements.headCircumference * 0.1) + points.backPitchCp1 = points.backPitch.shift(-90, measurements.head * 0.1) points.backPitchCp2 = points.backPitchCp1.flipY(points.backPitch) // Paths diff --git a/packages/huey/src/waistband.js b/packages/huey/src/waistband.js index 57949af5156..37821613128 100644 --- a/packages/huey/src/waistband.js +++ b/packages/huey/src/waistband.js @@ -1,13 +1,10 @@ import { draftRibbing } from './shared' -export default function(part) { +export default function (part) { let { complete, points, measurements, options, macro } = part.shorthand() if (!options.ribbing) return part - draftRibbing( - part, - measurements.hipsCircumference * (1 + options.hipsEase) * (1 - options.ribbingStretch) - ) + draftRibbing(part, measurements.hips * (1 + options.hipsEase) * (1 - options.ribbingStretch)) // Complete pattern? if (complete) {