diff --git a/packages/jaeger/config/index.js b/packages/jaeger/config/index.js index a9c39a82960..af7d5fea19e 100644 --- a/packages/jaeger/config/index.js +++ b/packages/jaeger/config/index.js @@ -75,18 +75,18 @@ export default { ] }, measurements: [ - 'bicepsCircumference', - 'chestCircumference', - 'hipsCircumference', + 'biceps', + 'chest', + 'hips', 'hpsToWaistBack', - 'waistCircumference', + 'waist', 'waistToHips', - 'neckCircumference', + 'neck', 'shoulderSlope', 'shoulderToElbow', 'shoulderToShoulder', 'shoulderToWrist', - 'wristCircumference' + 'wrist' ], dependencies: { bentBack: 'bentBase', diff --git a/packages/jaeger/src/back.js b/packages/jaeger/src/back.js index 8d237bc3d5d..9d80219f6c8 100644 --- a/packages/jaeger/src/back.js +++ b/packages/jaeger/src/back.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -34,11 +34,11 @@ export default function(part) { .split(points.ventStart) .pop() .line(points.cbHem) - paths.vent = paths.ventBase.offset(measurements.neckCircumference / 10) + paths.vent = paths.ventBase.offset(measurements.neck / 10) paths.vent.render = false points.ventSlopeStart = utils.lineIntersectsCurve( paths.vent.start(), - paths.vent.start().shift(10, measurements.neckCircumference / 5), + paths.vent.start().shift(10, measurements.neck / 5), points.cbHips, points.cbHipsCp1, points.cbWaistCp2, @@ -60,11 +60,11 @@ export default function(part) { .split(points.ventStart) .pop() .line(points.hem) - paths.vent = paths.ventBase.offset(measurements.neckCircumference / -10) + paths.vent = paths.ventBase.offset(measurements.neck / -10) paths.vent.render = false points.ventSlopeStart = utils.lineIntersectsCurve( paths.vent.start(), - paths.vent.start().shift(170, measurements.neckCircumference / 5), + paths.vent.start().shift(170, measurements.neck / 5), points.hips, points.hipsCp2, points.waistCp1, diff --git a/packages/jaeger/src/backbase.js b/packages/jaeger/src/backbase.js index 8fa8df7c073..3d2938f91ca 100644 --- a/packages/jaeger/src/backbase.js +++ b/packages/jaeger/src/backbase.js @@ -1,6 +1,6 @@ import { calculateRatios, backSideBoundary } from './shared' -export default function(part) { +export default function (part) { calculateRatios(part) let { store, points, measurements, options, Point, paths, Path } = part.shorthand() @@ -11,7 +11,7 @@ export default function(part) { points.cbChest = new Point(0, points.armholePitchCp1.y) if (options.centerBackDart > 0) { points.cbChestCp1 = points.cbChest.shiftFractionTowards(points.cbNeck, 0.5) - points.cbNeck = points.cbNeck.shift(0, measurements.chestCircumference * options.centerBackDart) + points.cbNeck = points.cbNeck.shift(0, measurements.chest * options.centerBackDart) } points.cbChestCp2 = points.cbChest.shift(-90, points.cbChest.dy(points.cbWaist) / 3) points.cbWaist = points.cbWaist.shift( @@ -53,10 +53,7 @@ export default function(part) { // Store length of back collar store.set( 'backCollarLength', - new Path() - .move(points.cbNeck) - ._curve(points.neckCp2, points.neck) - .length() + new Path().move(points.cbNeck)._curve(points.neckCp2, points.neck).length() ) // Paths diff --git a/packages/jaeger/src/collarstand.js b/packages/jaeger/src/collarstand.js index 57699998746..aae5ed8ade3 100644 --- a/packages/jaeger/src/collarstand.js +++ b/packages/jaeger/src/collarstand.js @@ -5,7 +5,7 @@ * experience, or more tailoring exprience. */ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -58,7 +58,7 @@ export default function(part) { points.collarCbTopDirection = points.neck.rotate(-90, points.collarstandCbBottom) // right direction, but too far points.collarCbTop = points.collarstandCbBottom.shiftTowards( points.collarCbTopDirection, - measurements.neckCircumference * options.collarHeight * 2 + measurements.neck * options.collarHeight * 2 ) // Rotate points diff --git a/packages/jaeger/src/front.js b/packages/jaeger/src/front.js index 0d2afcefb13..0fef6c8f861 100644 --- a/packages/jaeger/src/front.js +++ b/packages/jaeger/src/front.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -17,7 +17,7 @@ export default function(part) { } = part.shorthand() // Front closure overlap - points.neckEdge = points.cfNeck.shift(180, measurements.chestCircumference * options.frontOverlap) + points.neckEdge = points.cfNeck.shift(180, measurements.chest * options.frontOverlap) points.hemEdge = new Point(points.neckEdge.x, points.cfHem.y) // Chest pocket @@ -91,9 +91,9 @@ export default function(part) { ) // Lapel roll line - let rollHeight = measurements.neckCircumference * options.rollLineCollarHeight + let rollHeight = measurements.neck * options.rollLineCollarHeight points.shoulderRoll = points.shoulder.shiftOutwards(points.neck, rollHeight) - let collarHeight = measurements.neckCircumference * options.collarHeight + let collarHeight = measurements.neck * options.collarHeight points.shoulderRollCb = points.lapelBreakPoint.shiftOutwards( points.shoulderRoll, store.get('backCollarLength') @@ -311,10 +311,7 @@ export default function(part) { paths.hemBase = new Path().move(points.roundEnd).line(points.hem) paths.hemBase.render = false - paths.seam = paths.saBase - .clone() - .join(paths.hemBase) - .attr('class', 'fabric') + paths.seam = paths.saBase.clone().join(paths.hemBase).attr('class', 'fabric') paths.flb = new Path() .move(points.facingTop) diff --git a/packages/jaeger/src/shared.js b/packages/jaeger/src/shared.js index ea000bc3686..ac22d5cfbc2 100644 --- a/packages/jaeger/src/shared.js +++ b/packages/jaeger/src/shared.js @@ -9,9 +9,9 @@ export const calculateRatios = (part) => { options.rollLineCollarHeight = options.collarHeight * 2 // Calculate different values for reducing from chest to hips via waist - store.set('chest', measurements.chestCircumference * (1 + options.chestEase)) - store.set('waist', measurements.waistCircumference * (1 + options.waistEase)) - store.set('hips', measurements.hipsCircumference * (1 + options.hipsEase)) + store.set('chest', measurements.chest * (1 + options.chestEase)) + store.set('waist', measurements.waist * (1 + options.waistEase)) + store.set('hips', measurements.hips * (1 + options.hipsEase)) store.set('waistReduction', store.get('chest') - store.get('waist')) store.set('hipsReduction', store.get('chest') - store.get('hips')) diff --git a/packages/jaeger/src/side.js b/packages/jaeger/src/side.js index a4a923d722d..8a31b03b2e4 100644 --- a/packages/jaeger/src/side.js +++ b/packages/jaeger/src/side.js @@ -31,11 +31,11 @@ export default function (part) { .split(points.ventStart) .pop() .line(points.bsHem) - paths.vent = paths.ventBase.offset(measurements.neckCircumference / -10) + paths.vent = paths.ventBase.offset(measurements.neck / -10) //paths.vent.render = false; points.ventSlopeStart = utils.lineIntersectsCurve( paths.vent.start(), - paths.vent.start().shift(170, measurements.neckCircumference / 5), + paths.vent.start().shift(170, measurements.neck / 5), points.bsHips, points.bsHipsCp2, points.bsWaistCp1, diff --git a/packages/jaeger/src/topsleeve.js b/packages/jaeger/src/topsleeve.js index a2acd255bb4..dbf715719dd 100644 --- a/packages/jaeger/src/topsleeve.js +++ b/packages/jaeger/src/topsleeve.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -14,7 +14,7 @@ export default function(part) { // Vent let slope = 15 - let width = measurements.wristCircumference * (1 + options.cuffEase) * options.sleeveVentWidth + let width = measurements.wrist * (1 + options.cuffEase) * options.sleeveVentWidth points.ventFoldRight = points.tsWristLeft.shiftOutwards(points.tsWristRight, width) points.ventHelper = points.tsWristRight.shiftFractionTowards( points.elbowRight, diff --git a/packages/jaeger/src/undersleeve.js b/packages/jaeger/src/undersleeve.js index a5cd2640f2a..f931b159e4b 100644 --- a/packages/jaeger/src/undersleeve.js +++ b/packages/jaeger/src/undersleeve.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -14,7 +14,7 @@ export default function(part) { // Vent let slope = 15 - let width = measurements.wristCircumference * (1 + options.cuffEase) * options.sleeveVentWidth + let width = measurements.wrist * (1 + options.cuffEase) * options.sleeveVentWidth points.ventFoldRight = points.usWristLeft.shiftOutwards(points.usWristRight, width) points.ventHelper = points.usWristRight.shiftFractionTowards( points.elbowRight,