1
0
Fork 0

🔧 Updated Simon with more sensible defaults for ease options. Closes #100

This commit is contained in:
Joost De Cock 2019-09-06 15:57:30 +02:00
parent 2dce1c3ffd
commit 69293dee14
2 changed files with 121 additions and 124 deletions

View file

@ -22,6 +22,9 @@ Unreleased:
- DraftConfigurator now properly styles pattern options 3 levels deep - DraftConfigurator now properly styles pattern options 3 levels deep
create-freesewing-pattern: create-freesewing-pattern:
- Added missing `file-saver` dependency - Added missing `file-saver` dependency
simon:
- "[#100](https://github.com/freesewing/freesewing.org/issues/100):
Updated simon with more sensible defaults for ease options"
Security: Security:
2.0.1: 2.0.1:

View file

@ -1,139 +1,133 @@
import { version } from "../package.json"; import { version } from '../package.json'
export default { export default {
name: "simon", name: 'simon',
version, version,
design: "Joost De Cock", design: 'Joost De Cock',
code: "Joost De Cock", code: 'Joost De Cock',
department: "menswear", department: 'menswear',
type: "pattern", type: 'pattern',
difficulty: 4, difficulty: 4,
tags: ["top"], tags: ['top'],
optionGroups: { optionGroups: {
fit: [ fit: [
"chestEase", 'chestEase',
"collarEase", 'collarEase',
"bicepsEase", 'bicepsEase',
"cuffEase", 'cuffEase',
"shoulderEase", 'shoulderEase',
"lengthBonus", 'lengthBonus',
"sleeveLengthBonus", 'sleeveLengthBonus',
"waistEase", 'waistEase',
"hipsEase", 'hipsEase',
"yokeDart" 'yokeDart'
], ],
style: [ style: [
"splitYoke", 'splitYoke',
"hemStyle", 'hemStyle',
"hemCurve", 'hemCurve',
{ {
closure: [ closure: [
"extraTopButton", 'extraTopButton',
"buttons", 'buttons',
"seperateButtonPlacket", 'seperateButtonPlacket',
"buttonPlacketStyle", 'buttonPlacketStyle',
"seperateButtonholePlacket", 'seperateButtonholePlacket',
"buttonholePlacketStyle", 'buttonholePlacketStyle',
"buttonPlacketWidth", 'buttonPlacketWidth',
"buttonholePlacketWidth", 'buttonholePlacketWidth',
"buttonholePlacketFoldWidth", 'buttonholePlacketFoldWidth',
"buttonFreeLength" 'buttonFreeLength'
] ]
}, },
{ {
cuffs: [ cuffs: [
"cuffStyle", 'cuffStyle',
"barrelCuffNarrowButton", 'barrelCuffNarrowButton',
"cuffButtonRows", 'cuffButtonRows',
"sleevePlacketWidth", 'sleevePlacketWidth',
"sleevePlacketLength", 'sleevePlacketLength',
"cuffDrape", 'cuffDrape',
"cuffLength" 'cuffLength'
] ]
}, },
{ {
collar: [ collar: [
"collarAngle", 'collarAngle',
"collarStandBend", 'collarStandBend',
"collarStandCurve", 'collarStandCurve',
"collarFlare", 'collarFlare',
"collarStandWidth", 'collarStandWidth',
"collarBend", 'collarBend',
"collarGap", 'collarGap',
"collarRoll" 'collarRoll'
] ]
} }
], ],
advanced: [ advanced: [
"acrossBackFactor", 'acrossBackFactor',
"armholeDepthFactor", 'armholeDepthFactor',
"backNeckCutout", 'backNeckCutout',
"frontArmholeDeeper", 'frontArmholeDeeper',
"shoulderSlopeReduction", 'shoulderSlopeReduction',
"sleeveWidthGuarantee", 'sleeveWidthGuarantee',
{ {
sleevecap: [ sleevecap: [
"sleevecapEase", 'sleevecapEase',
"sleevecapTopFactorX", 'sleevecapTopFactorX',
"sleevecapTopFactorY", 'sleevecapTopFactorY',
"sleevecapBackFactorX", 'sleevecapBackFactorX',
"sleevecapBackFactorY", 'sleevecapBackFactorY',
"sleevecapFrontFactorX", 'sleevecapFrontFactorX',
"sleevecapFrontFactorY", 'sleevecapFrontFactorY',
"sleevecapQ1Offset", 'sleevecapQ1Offset',
"sleevecapQ2Offset", 'sleevecapQ2Offset',
"sleevecapQ3Offset", 'sleevecapQ3Offset',
"sleevecapQ4Offset", 'sleevecapQ4Offset',
"sleevecapQ1Spread1", 'sleevecapQ1Spread1',
"sleevecapQ1Spread2", 'sleevecapQ1Spread2',
"sleevecapQ2Spread1", 'sleevecapQ2Spread1',
"sleevecapQ2Spread2", 'sleevecapQ2Spread2',
"sleevecapQ3Spread1", 'sleevecapQ3Spread1',
"sleevecapQ3Spread2", 'sleevecapQ3Spread2',
"sleevecapQ4Spread1", 'sleevecapQ4Spread1',
"sleevecapQ4Spread2" 'sleevecapQ4Spread2'
] ]
} }
] ]
}, },
measurements: [ measurements: [
"bicepsCircumference", 'bicepsCircumference',
"centerBackNeckToWaist", 'centerBackNeckToWaist',
"chestCircumference", 'chestCircumference',
"naturalWaist", 'naturalWaist',
"naturalWaistToHip", 'naturalWaistToHip',
"neckCircumference", 'neckCircumference',
"shoulderSlope", 'shoulderSlope',
"shoulderToShoulder", 'shoulderToShoulder',
"hipsCircumference", 'hipsCircumference',
"shoulderToWrist", 'shoulderToWrist',
"wristCircumference" 'wristCircumference'
], ],
dependencies: { dependencies: {
sleeveBase: ["frontBase", "backBase"], sleeveBase: ['frontBase', 'backBase'],
sleeve: ["sleeveBase", "front", "back"] sleeve: ['sleeveBase', 'front', 'back']
}, },
inject: { inject: {
frontBase: "base", frontBase: 'base',
backBase: "base", backBase: 'base',
back: "backBase", back: 'backBase',
front: "frontBase", front: 'frontBase',
frontRight: "front", frontRight: 'front',
frontLeft: "front", frontLeft: 'front',
buttonPlacket: "front", buttonPlacket: 'front',
buttonholePlacket: "front", buttonholePlacket: 'front',
yoke: "backBase", yoke: 'backBase',
sleeveBase: "front", sleeveBase: 'front',
sleeve: "sleeveBase" sleeve: 'sleeveBase'
}, },
parts: [ parts: ['collarStand', 'collar', 'sleevePlacketUnderlap', 'sleevePlacketOverlap', 'cuff'],
"collarStand", hide: ['base', 'frontBase', 'front', 'backBase', 'sleeveBase'],
"collar",
"sleevePlacketUnderlap",
"sleevePlacketOverlap",
"cuff"
],
hide: ["base", "frontBase", "front", "backBase", "sleeveBase"],
options: { options: {
// Constants // Constants
collarFactor: 5, collarFactor: 5,
@ -151,27 +145,27 @@ export default {
// Lists // Lists
hemStyle: { hemStyle: {
list: ["straight", "baseball", "slashed"], list: ['straight', 'baseball', 'slashed'],
dflt: "straight" dflt: 'straight'
}, },
buttonPlacketStyle: { buttonPlacketStyle: {
list: ["classic", "seamless"], list: ['classic', 'seamless'],
dflt: "classic" dflt: 'classic'
}, },
buttonholePlacketStyle: { buttonholePlacketStyle: {
list: ["classic", "seamless"], list: ['classic', 'seamless'],
dflt: "seamless" dflt: 'seamless'
}, },
cuffStyle: { cuffStyle: {
list: [ list: [
"roundedBarrelCuff", 'roundedBarrelCuff',
"angledBarrelCuff", 'angledBarrelCuff',
"straightBarrelCuff", 'straightBarrelCuff',
"roundedFrenchCuff", 'roundedFrenchCuff',
"angledFrenchCuff", 'angledFrenchCuff',
"straightFrenchCuff" 'straightFrenchCuff'
], ],
dflt: "angledBarrelCuff" dflt: 'angledBarrelCuff'
}, },
// Counters // Counters
@ -195,21 +189,21 @@ export default {
acrossBackFactor: { pct: 97, min: 93, max: 100 }, acrossBackFactor: { pct: 97, min: 93, max: 100 },
armholeDepthFactor: { pct: 60, min: 50, max: 70 }, armholeDepthFactor: { pct: 60, min: 50, max: 70 },
backNeckCutout: { pct: 5, min: 2, max: 8 }, backNeckCutout: { pct: 5, min: 2, max: 8 },
bicepsEase: { pct: 15, min: 0, max: 50 }, bicepsEase: { pct: 20, min: 10, max: 50 },
buttonFreeLength: { pct: 2, min: 0, max: 15 }, buttonFreeLength: { pct: 2, min: 0, max: 40 },
chestEase: { pct: 8, min: -4, max: 20 }, chestEase: { pct: 20, min: 10, max: 35 },
collarBend: { pct: 5, min: 0, max: 10 }, collarBend: { pct: 5, min: 0, max: 10 },
collarEase: { pct: 3.5, min: 0, max: 10 }, collarEase: { pct: 3.5, min: 2, max: 10 },
collarGap: { pct: 3, min: 0, max: 6 }, collarGap: { pct: 3, min: 0, max: 6 },
collarRoll: { pct: 3, min: 0, max: 6 }, collarRoll: { pct: 3, min: 0, max: 6 },
cuffDrape: { pct: 5, min: 0, max: 10 }, cuffDrape: { pct: 5, min: 0, max: 10 },
cuffEase: { pct: 20, min: 0, max: 30 }, cuffEase: { pct: 20, min: 10, max: 40 },
cuffLength: { pct: 10, min: 3, max: 15 }, cuffLength: { pct: 10, min: 3, max: 15 },
frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 }, frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 },
hemCurve: { pct: 50, min: 25, max: 100 }, hemCurve: { pct: 50, min: 25, max: 100 },
hipsEase: { pct: 8, min: -4, max: 20 }, hipsEase: { pct: 20, min: 10, max: 40 },
lengthBonus: { pct: 25, min: -4, max: 60 }, lengthBonus: { pct: 25, min: -4, max: 60 },
shoulderEase: { pct: 0, min: -2, max: 6 }, shoulderEase: { pct: 2, min: 0, max: 15 },
shoulderSlopeReduction: { pct: 0, min: 0, max: 8 }, shoulderSlopeReduction: { pct: 0, min: 0, max: 8 },
sleevecapEase: { pct: 1, min: 0, max: 10 }, sleevecapEase: { pct: 1, min: 0, max: 10 },
sleevecapTopFactorX: { pct: 50, min: 25, max: 75 }, sleevecapTopFactorX: { pct: 50, min: 25, max: 75 },
@ -233,7 +227,7 @@ export default {
sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 },
sleeveLengthBonus: { pct: 0, min: -40, max: 10 }, sleeveLengthBonus: { pct: 0, min: -40, max: 10 },
sleevePlacketLength: { pct: 25, min: 15, max: 35 }, sleevePlacketLength: { pct: 25, min: 15, max: 35 },
waistEase: { pct: 8, min: -4, max: 20 }, waistEase: { pct: 20, min: 10, max: 35 },
yokeDart: { pct: 0, min: 0, max: 15 } yokeDart: { pct: 0, min: 0, max: 15 }
} }
}; }