VSinerva/freesewing
1
0
Fork 0
Code Activity

chore(jaeger) Removed circumference suffix from measurements

Browse source
This commit is contained in:
Joost De Cock 2020-06-28 13:08:33 +02:00
parent 257bbfeaae
commit b3483b30b2
9 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/jaeger/config/index.js
View file

@ -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',

8
packages/jaeger/src/back.js
View file

@ -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,

7
packages/jaeger/src/backbase.js
View file

@ -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

2
packages/jaeger/src/collarstand.js
View file

@ -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

11
packages/jaeger/src/front.js
View file

@ -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)

6
packages/jaeger/src/shared.js
View file

@ -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'))

4
packages/jaeger/src/side.js
View file

@ -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,

2
packages/jaeger/src/topsleeve.js
View file

@ -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,

2
packages/jaeger/src/undersleeve.js
View file

@ -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,