From e0561ba14d815fb0f60c2245d37029f180c0f9b4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 28 Jun 2020 12:17:13 +0200 Subject: [PATCH] chore(waralee) Removed circumference suffix from measurements --- packages/waralee/config/index.js | 2 +- packages/waralee/src/pantsproto.js | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js index b3ce739ada6..c4ddc063088 100644 --- a/packages/waralee/config/index.js +++ b/packages/waralee/config/index.js @@ -24,7 +24,7 @@ export default { 'crotchFactorFrontVer' ] }, - measurements: ['seatCircumference', 'inseam', 'crotchDepth', 'waistToHips'], + measurements: ['seat', 'inseam', 'crotchDepth', 'waistToHips'], dependencies: {}, inject: { pants: 'pantsproto', mini: 'pantsproto' }, hide: [], diff --git a/packages/waralee/src/pantsproto.js b/packages/waralee/src/pantsproto.js index f24508349a3..eee9518c6d5 100644 --- a/packages/waralee/src/pantsproto.js +++ b/packages/waralee/src/pantsproto.js @@ -4,7 +4,7 @@ export default function (part) { let { options, measurements, Point, Path, points, paths } = part.shorthand() let seatDepth = (measurements.crotchDepth - measurements.waistToHips) * (1 + options.waistRaise) - let circumference = measurements.seatCircumference + let circumference = measurements.seat let circumference4 = circumference / 4 points.mWaist = new Point(0, 0) @@ -83,7 +83,7 @@ export default function (part) { options.frontPocketVerticalOffset * (measurements.crotchDepth - measurements.waistToHips) + options.waistBand * 2 ) - .shift(180, options.frontPocketHorizontalOffset * measurements.seatCircumference) + .shift(180, options.frontPocketHorizontalOffset * measurements.seat) points.frontPocketTop2 = points.frontPocketTop.shift(340, 12) points.frontPocketBottom = points.frontPocketTop.shift( @@ -103,10 +103,7 @@ export default function (part) { if (options.backPocket) { points.backPocketRight = points.bWaistBack - .shiftTowards( - points.bWaistSide, - options.backPocketHorizontalOffset * measurements.seatCircumference - ) + .shiftTowards(points.bWaistSide, options.backPocketHorizontalOffset * measurements.seat) .shift( 270, options.backPocketVerticalOffset * (measurements.crotchDepth - measurements.waistToHips) + @@ -115,7 +112,7 @@ export default function (part) { points.backPocketLeft = points.bWaistBack .shiftTowards( points.bWaistSide, - options.backPocketHorizontalOffset * measurements.seatCircumference + + options.backPocketHorizontalOffset * measurements.seat + options.backPocketSize * (measurements.crotchDepth - measurements.waistToHips) ) .shift(