VSinerva/freesewing
1
0
Fork 0
Code Activity

chore(huey) Removed circumference suffix from measurements

Browse source
This commit is contained in:
Joost De Cock 2020-06-28 13:10:06 +02:00
parent 639f92ba78
commit 7ebd2aa8e9
6 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,17 +65,17 @@ export default {
] ]
}, },
measurements: [ measurements: [
'bicepsCircumference', 'biceps',
'chestCircumference', 'chest',
'headCircumference', 'head',
'hipsCircumference', 'hips',
'hpsToWaistBack', 'hpsToWaistBack',
'waistToHips', 'waistToHips',
'neckCircumference', 'neck',
'shoulderSlope', 'shoulderSlope',
'shoulderToShoulder', 'shoulderToShoulder',
'shoulderToWrist', 'shoulderToWrist',
'wristCircumference' 'wrist'
], ],
dependencies: { dependencies: {
backBase: 'base', backBase: 'base',

2
packages/huey/src/back.js
View file

@ -26,7 +26,7 @@ export default function (part) {
} }
// Shape side seam // 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.hem.x = points.hips.x
points.hemCp2 = new Point(points.hips.x, points.cbWaist.y) points.hemCp2 = new Point(points.hips.x, points.cbWaist.y)

7
packages/huey/src/cuff.js
View file

@ -1,13 +1,10 @@
import { draftRibbing } from './shared' import { draftRibbing } from './shared'
export default part => { export default (part) => {
let { complete, points, measurements, options, macro } = part.shorthand() let { complete, points, measurements, options, macro } = part.shorthand()
if (!options.ribbing) return part if (!options.ribbing) return part
draftRibbing( draftRibbing(part, measurements.wrist * (1 + options.cuffEase) * (1 - options.ribbingStretch))
part,
measurements.wristCircumference * (1 + options.cuffEase) * (1 - options.ribbingStretch)
)
// Complete pattern? // Complete pattern?
if (complete) { if (complete) {

2
packages/huey/src/front.js
View file

@ -24,7 +24,7 @@ export default function (part) {
} }
// Shape side seam // 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.hem.x = points.hips.x
points.hemCp2 = new Point(points.hips.x, points.cfWaist.y) points.hemCp2 = new Point(points.hips.x, points.cfWaist.y)

18
packages/huey/src/hood.js
View file

@ -1,4 +1,4 @@
export default function(part) { export default function (part) {
let { let {
store, store,
macro, macro,
@ -18,24 +18,18 @@ export default function(part) {
let base = store.get('frontNeckSeamLength') + store.get('backNeckSeamLength') let base = store.get('frontNeckSeamLength') + store.get('backNeckSeamLength')
points.cfBottom = new Point(0, 0) points.cfBottom = new Point(0, 0)
points.cbBottom = points.cfBottom.shift(0, base).rotate(options.hoodAngle, points.cfBottom) points.cbBottom = points.cfBottom.shift(0, base).rotate(options.hoodAngle, points.cfBottom)
points.cfHeightLeft = points.cfBottom.shift( points.cfHeightLeft = points.cfBottom.shift(90, measurements.head * options.hoodHeight)
90,
measurements.headCircumference * options.hoodHeight
)
points.cfHeightRight = points.cfHeightLeft.shift(0, base) points.cfHeightRight = points.cfHeightLeft.shift(0, base)
points.cfTop = points.cfBottom points.cfTop = points.cfBottom
.shift(90, measurements.headCircumference * options.hoodClosure) .shift(90, measurements.head * options.hoodClosure)
.rotate(options.hoodAngle, points.cfBottom) .rotate(options.hoodAngle, points.cfBottom)
points.frontTop = points.cfHeightLeft.shift( points.frontTop = points.cfHeightLeft.shift(0, measurements.head * options.hoodCutback)
0,
measurements.headCircumference * options.hoodCutback
)
points.frontTopCp2 = new Point(points.frontTop.x, points.cfTop.y) points.frontTopCp2 = new Point(points.frontTop.x, points.cfTop.y)
points.backPitch = new Point( points.backPitch = new Point(
points.cbBottom.x + measurements.headCircumference * options.hoodDepth, points.cbBottom.x + measurements.head * options.hoodDepth,
points.cfHeightRight.y * 0.6 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) points.backPitchCp2 = points.backPitchCp1.flipY(points.backPitch)
// Paths // Paths

7
packages/huey/src/waistband.js
View file

@ -1,13 +1,10 @@
import { draftRibbing } from './shared' import { draftRibbing } from './shared'
export default function(part) { export default function (part) {
let { complete, points, measurements, options, macro } = part.shorthand() let { complete, points, measurements, options, macro } = part.shorthand()
if (!options.ribbing) return part if (!options.ribbing) return part
draftRibbing( draftRibbing(part, measurements.hips * (1 + options.hipsEase) * (1 - options.ribbingStretch))
part,
measurements.hipsCircumference * (1 + options.hipsEase) * (1 - options.ribbingStretch)
)
// Complete pattern? // Complete pattern?
if (complete) { if (complete) {