diff --git a/packages/penelope/config/index.js b/packages/penelope/config/index.js index cb5a82e8420..549dc87e270 100644 --- a/packages/penelope/config/index.js +++ b/packages/penelope/config/index.js @@ -32,13 +32,7 @@ export default { 'dartToSideSeamFactor' ] }, - measurements: [ - 'waistCircumference', - 'seatCircumference', - 'waistToHips', - 'waistToSeat', - 'waistToKnee' - ], + measurements: ['waist', 'seat', 'waistToHips', 'waistToSeat', 'waistToKnee'], dependencies: {}, inject: {}, hide: [], diff --git a/packages/penelope/src/shape.js b/packages/penelope/src/shape.js index 21384784a66..cdb3f6da617 100644 --- a/packages/penelope/src/shape.js +++ b/packages/penelope/src/shape.js @@ -23,8 +23,8 @@ function BuildMainShape(part, frontPart) { let dartDepthFactor = frontPart ? options.frontDartDepthFactor : options.backDartDepthFactor - let waist = measurements.waistCircumference - let seat = measurements.seatCircumference > waist ? measurements.seatCircumference : waist + let waist = measurements.waist + let seat = measurements.seat > waist ? measurements.seat : waist dartCalc(options, seat, seatEase, waist, waistEase) @@ -203,7 +203,7 @@ function BuildMainShape(part, frontPart) { paths.waist = waistPath.reverse().setRender(false) paths.waistSA = waistPathSA.reverse().setRender(false) - points.titleAnchor = new Point(measurements.waistCircumference / 6, measurements.waistToSeat) + points.titleAnchor = new Point(measurements.waist / 6, measurements.waistToSeat) points.logoAnchor = points.titleAnchor.shift(270, 75) points.grainlineTop = points.lWaist.shift(0, 50).shift(270, 50) diff --git a/packages/penelope/src/waistband.js b/packages/penelope/src/waistband.js index 2a1491ab2f7..c4be5e88a91 100644 --- a/packages/penelope/src/waistband.js +++ b/packages/penelope/src/waistband.js @@ -20,7 +20,7 @@ export default function (part) { } let waistEase = options.waistEase - let waist = measurements.waistCircumference + let waist = measurements.waist waist += waistEase points.TL = new Point(0, 0)