From 69293dee1430cb11ee2c8a43869358cfc841ff18 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 6 Sep 2019 15:57:30 +0200 Subject: [PATCH] :wrench: Updated Simon with more sensible defaults for ease options. Closes #100 --- config/changelog.yaml | 3 + packages/simon/config/index.js | 242 ++++++++++++++++----------------- 2 files changed, 121 insertions(+), 124 deletions(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index 7ba5a5547d5..6e4c0a0884b 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -22,6 +22,9 @@ Unreleased: - DraftConfigurator now properly styles pattern options 3 levels deep create-freesewing-pattern: - 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: 2.0.1: diff --git a/packages/simon/config/index.js b/packages/simon/config/index.js index aaa7871beab..16964f6a62b 100644 --- a/packages/simon/config/index.js +++ b/packages/simon/config/index.js @@ -1,139 +1,133 @@ -import { version } from "../package.json"; +import { version } from '../package.json' export default { - name: "simon", + name: 'simon', version, - design: "Joost De Cock", - code: "Joost De Cock", - department: "menswear", - type: "pattern", + design: 'Joost De Cock', + code: 'Joost De Cock', + department: 'menswear', + type: 'pattern', difficulty: 4, - tags: ["top"], + tags: ['top'], optionGroups: { fit: [ - "chestEase", - "collarEase", - "bicepsEase", - "cuffEase", - "shoulderEase", - "lengthBonus", - "sleeveLengthBonus", - "waistEase", - "hipsEase", - "yokeDart" + 'chestEase', + 'collarEase', + 'bicepsEase', + 'cuffEase', + 'shoulderEase', + 'lengthBonus', + 'sleeveLengthBonus', + 'waistEase', + 'hipsEase', + 'yokeDart' ], style: [ - "splitYoke", - "hemStyle", - "hemCurve", + 'splitYoke', + 'hemStyle', + 'hemCurve', { closure: [ - "extraTopButton", - "buttons", - "seperateButtonPlacket", - "buttonPlacketStyle", - "seperateButtonholePlacket", - "buttonholePlacketStyle", - "buttonPlacketWidth", - "buttonholePlacketWidth", - "buttonholePlacketFoldWidth", - "buttonFreeLength" + 'extraTopButton', + 'buttons', + 'seperateButtonPlacket', + 'buttonPlacketStyle', + 'seperateButtonholePlacket', + 'buttonholePlacketStyle', + 'buttonPlacketWidth', + 'buttonholePlacketWidth', + 'buttonholePlacketFoldWidth', + 'buttonFreeLength' ] }, { cuffs: [ - "cuffStyle", - "barrelCuffNarrowButton", - "cuffButtonRows", - "sleevePlacketWidth", - "sleevePlacketLength", - "cuffDrape", - "cuffLength" + 'cuffStyle', + 'barrelCuffNarrowButton', + 'cuffButtonRows', + 'sleevePlacketWidth', + 'sleevePlacketLength', + 'cuffDrape', + 'cuffLength' ] }, { collar: [ - "collarAngle", - "collarStandBend", - "collarStandCurve", - "collarFlare", - "collarStandWidth", - "collarBend", - "collarGap", - "collarRoll" + 'collarAngle', + 'collarStandBend', + 'collarStandCurve', + 'collarFlare', + 'collarStandWidth', + 'collarBend', + 'collarGap', + 'collarRoll' ] } ], advanced: [ - "acrossBackFactor", - "armholeDepthFactor", - "backNeckCutout", - "frontArmholeDeeper", - "shoulderSlopeReduction", - "sleeveWidthGuarantee", + 'acrossBackFactor', + 'armholeDepthFactor', + 'backNeckCutout', + 'frontArmholeDeeper', + 'shoulderSlopeReduction', + 'sleeveWidthGuarantee', { sleevecap: [ - "sleevecapEase", - "sleevecapTopFactorX", - "sleevecapTopFactorY", - "sleevecapBackFactorX", - "sleevecapBackFactorY", - "sleevecapFrontFactorX", - "sleevecapFrontFactorY", - "sleevecapQ1Offset", - "sleevecapQ2Offset", - "sleevecapQ3Offset", - "sleevecapQ4Offset", - "sleevecapQ1Spread1", - "sleevecapQ1Spread2", - "sleevecapQ2Spread1", - "sleevecapQ2Spread2", - "sleevecapQ3Spread1", - "sleevecapQ3Spread2", - "sleevecapQ4Spread1", - "sleevecapQ4Spread2" + 'sleevecapEase', + 'sleevecapTopFactorX', + 'sleevecapTopFactorY', + 'sleevecapBackFactorX', + 'sleevecapBackFactorY', + 'sleevecapFrontFactorX', + 'sleevecapFrontFactorY', + 'sleevecapQ1Offset', + 'sleevecapQ2Offset', + 'sleevecapQ3Offset', + 'sleevecapQ4Offset', + 'sleevecapQ1Spread1', + 'sleevecapQ1Spread2', + 'sleevecapQ2Spread1', + 'sleevecapQ2Spread2', + 'sleevecapQ3Spread1', + 'sleevecapQ3Spread2', + 'sleevecapQ4Spread1', + 'sleevecapQ4Spread2' ] } ] }, measurements: [ - "bicepsCircumference", - "centerBackNeckToWaist", - "chestCircumference", - "naturalWaist", - "naturalWaistToHip", - "neckCircumference", - "shoulderSlope", - "shoulderToShoulder", - "hipsCircumference", - "shoulderToWrist", - "wristCircumference" + 'bicepsCircumference', + 'centerBackNeckToWaist', + 'chestCircumference', + 'naturalWaist', + 'naturalWaistToHip', + 'neckCircumference', + 'shoulderSlope', + 'shoulderToShoulder', + 'hipsCircumference', + 'shoulderToWrist', + 'wristCircumference' ], dependencies: { - sleeveBase: ["frontBase", "backBase"], - sleeve: ["sleeveBase", "front", "back"] + sleeveBase: ['frontBase', 'backBase'], + sleeve: ['sleeveBase', 'front', 'back'] }, inject: { - frontBase: "base", - backBase: "base", - back: "backBase", - front: "frontBase", - frontRight: "front", - frontLeft: "front", - buttonPlacket: "front", - buttonholePlacket: "front", - yoke: "backBase", - sleeveBase: "front", - sleeve: "sleeveBase" + frontBase: 'base', + backBase: 'base', + back: 'backBase', + front: 'frontBase', + frontRight: 'front', + frontLeft: 'front', + buttonPlacket: 'front', + buttonholePlacket: 'front', + yoke: 'backBase', + sleeveBase: 'front', + sleeve: 'sleeveBase' }, - parts: [ - "collarStand", - "collar", - "sleevePlacketUnderlap", - "sleevePlacketOverlap", - "cuff" - ], - hide: ["base", "frontBase", "front", "backBase", "sleeveBase"], + parts: ['collarStand', 'collar', 'sleevePlacketUnderlap', 'sleevePlacketOverlap', 'cuff'], + hide: ['base', 'frontBase', 'front', 'backBase', 'sleeveBase'], options: { // Constants collarFactor: 5, @@ -151,27 +145,27 @@ export default { // Lists hemStyle: { - list: ["straight", "baseball", "slashed"], - dflt: "straight" + list: ['straight', 'baseball', 'slashed'], + dflt: 'straight' }, buttonPlacketStyle: { - list: ["classic", "seamless"], - dflt: "classic" + list: ['classic', 'seamless'], + dflt: 'classic' }, buttonholePlacketStyle: { - list: ["classic", "seamless"], - dflt: "seamless" + list: ['classic', 'seamless'], + dflt: 'seamless' }, cuffStyle: { list: [ - "roundedBarrelCuff", - "angledBarrelCuff", - "straightBarrelCuff", - "roundedFrenchCuff", - "angledFrenchCuff", - "straightFrenchCuff" + 'roundedBarrelCuff', + 'angledBarrelCuff', + 'straightBarrelCuff', + 'roundedFrenchCuff', + 'angledFrenchCuff', + 'straightFrenchCuff' ], - dflt: "angledBarrelCuff" + dflt: 'angledBarrelCuff' }, // Counters @@ -195,21 +189,21 @@ export default { acrossBackFactor: { pct: 97, min: 93, max: 100 }, armholeDepthFactor: { pct: 60, min: 50, max: 70 }, backNeckCutout: { pct: 5, min: 2, max: 8 }, - bicepsEase: { pct: 15, min: 0, max: 50 }, - buttonFreeLength: { pct: 2, min: 0, max: 15 }, - chestEase: { pct: 8, min: -4, max: 20 }, + bicepsEase: { pct: 20, min: 10, max: 50 }, + buttonFreeLength: { pct: 2, min: 0, max: 40 }, + chestEase: { pct: 20, min: 10, max: 35 }, 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 }, collarRoll: { pct: 3, min: 0, max: 6 }, 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 }, frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 }, 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 }, - shoulderEase: { pct: 0, min: -2, max: 6 }, + shoulderEase: { pct: 2, min: 0, max: 15 }, shoulderSlopeReduction: { pct: 0, min: 0, max: 8 }, sleevecapEase: { pct: 1, min: 0, max: 10 }, sleevecapTopFactorX: { pct: 50, min: 25, max: 75 }, @@ -233,7 +227,7 @@ export default { sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, sleeveLengthBonus: { pct: 0, min: -40, max: 10 }, 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 } } -}; +}