diff --git a/packages/charlie/config/index.js b/packages/charlie/config/index.js index 6ee6060ce65..4974fc365be 100644 --- a/packages/charlie/config/index.js +++ b/packages/charlie/config/index.js @@ -25,15 +25,13 @@ export default { 'frontPocketSlantWidth', 'frontPocketSlantRound', 'frontPocketSlantBend', - 'frontPocketOpening', - 'frontPocketEntry', 'frontPocketWidth', 'frontPocketDepth', 'frontPocketFacing' ] } ], - waistband: ['splitWaistband', 'waistbandWidth'], + waistband: ['waistbandWidth'], advanced: [ 'crossSeamCurveStart', 'crossSeamCurveBend', @@ -130,8 +128,6 @@ export default { frontPocketSlantWidth: { pct: 25, min: 15, max: 35 }, frontPocketSlantRound: { pct: 30, min: 0, max: 50 }, frontPocketSlantBend: { pct: 25, min: 0, max: 50 }, - frontPocketOpening: { pct: 80, min: 60, max: 90 }, - frontPocketEntry: { pct: 20, min: 10, max: 30 }, frontPocketWidth: { pct: 55, min: 45, max: 65 }, frontPocketDepth: { pct: 100, min: 85, max: 110 }, frontPocketFacing: { pct: 45, min: 25, max: 65 }, @@ -142,7 +138,6 @@ export default { flyWidth: { pct: 15, min: 10, max: 20 }, // Waistband - splitWaistband: { bool: false }, beltLoops: { count: 8, min: 6, max: 12 } } } diff --git a/packages/i18n/src/locales/en/optiongroups.yaml b/packages/i18n/src/locales/en/optiongroups.yaml index d212dc056c2..3caa7014c55 100644 --- a/packages/i18n/src/locales/en/optiongroups.yaml +++ b/packages/i18n/src/locales/en/optiongroups.yaml @@ -12,3 +12,7 @@ preferences: Preferences sleevecap: Sleevecap sleeves: Sleeves style: Style +backPockets: Back pockets +frontPockets: Front pockets +waistband: Waistband +fly: Fly diff --git a/packages/i18n/src/locales/en/options/charlie.yml b/packages/i18n/src/locales/en/options/charlie.yml new file mode 100644 index 00000000000..e138a678c7c --- /dev/null +++ b/packages/i18n/src/locales/en/options/charlie.yml @@ -0,0 +1,45 @@ +backPocketHorizontalPlacement: + title: Back pocket horizontal placement + description: Controls the horizontal placement of the back pocket +backPocketVerticalPlacement: + title: Back pocket vertical placement + description: Controls the vertical placement of the back pocket +backPocketWidth: + title: Back pocket width + description: Controls the width of the back pocket +backPocketDepth: + title: Back pocket depth + description: Controls the depth of the back pocket +frontPocketSlantDepth: + title: Front pocket slant depth + description: Controls the depth of the (front) pocket slant +frontPocketSlantWidth: + title: Front pocket slant width + description: Controls the width of the (front) pocket slant +frontPocketSlantRound: + title: Front pocket slant round + description: Controls how far from the end of the slant we start rounding into the outseam +frontPocketSlantBend: + title: Front pocket slant bend + description: Controls the radius by which we round the pocket slant into the outseam +frontPocketWidth: + title: Front pocket width + description: Controls the width of the front pocket bag +frontPocketDepth: + title: Front pocket depth + description: Controls the depth of the front pocket bag +frontPocketFacing: + title: Front pocket facing + description: Controls how far the pocket facing extends into the pocket bag +beltLoops: + title: Belt loops + description: Controls the amount of belt loops +flyCurve: + title: Fly surve + description: Controls the curvature of the fly J-seam +flyLength: + title: Fly length + description: Controls the length of the fly +flyWidth: + title: Fly width + description: Controls how far the J-seam of offset from the fly edge diff --git a/packages/i18n/src/locales/en/options/index.js b/packages/i18n/src/locales/en/options/index.js index 483ddaab62c..293bbdb2754 100644 --- a/packages/i18n/src/locales/en/options/index.js +++ b/packages/i18n/src/locales/en/options/index.js @@ -32,6 +32,7 @@ import paco from './paco.yml' import albert from './albert.yml' import hortensia from './hortensia.yml' import cornelius from './cornelius.yml' +import charlie from './charlie.yml' import { options as optionList } from '@freesewing/pattern-info' import shared from '../../../shared-options.yml' @@ -69,7 +70,8 @@ let patterns = { teagan, albert, hortensia, - cornelius + cornelius, + charlie } let options = {} diff --git a/packages/i18n/src/locales/en/patterns.yml b/packages/i18n/src/locales/en/patterns.yml index 60fe78d15c1..9dbcb2acf72 100644 --- a/packages/i18n/src/locales/en/patterns.yml +++ b/packages/i18n/src/locales/en/patterns.yml @@ -31,6 +31,9 @@ carlton: cathrin: description: Cathrin is an underbust corset or waist trainer. title: Cathrin corset +charlie: + description: Charlie is a chino trouser pattern. + title: Charlie chinos cornelius: description: Cornelius are cycling breeches based on the Keystone drafting method. title: Cornelius cycling breeches diff --git a/packages/i18n/src/shared-options.yml b/packages/i18n/src/shared-options.yml index 43ed1ff2a35..507da22a45e 100644 --- a/packages/i18n/src/shared-options.yml +++ b/packages/i18n/src/shared-options.yml @@ -58,6 +58,11 @@ carlita: chestPocketHeight: carlton beltWidth: carlton buttonSpacingHorizontal: carlton +charlie: + dflt: titan + other: + seatEase: penelope + waistEase: penelope diana: dflt: brian other: diff --git a/packages/pattern-info/src/index.js b/packages/pattern-info/src/index.js index ffba50b474f..ecfec038c35 100644 --- a/packages/pattern-info/src/index.js +++ b/packages/pattern-info/src/index.js @@ -18,6 +18,7 @@ export const list = [ 'carlita', 'carlton', 'cathrin', + 'charlie', 'cornelius', 'diana', 'florent', @@ -51,6 +52,7 @@ export const withoutBreasts = [ 'brian', 'bruce', 'carlton', + 'charlie', 'cornelius', 'florent', 'florence', diff --git a/packages/pattern-info/src/prebuild.js b/packages/pattern-info/src/prebuild.js index ebeb39bace6..ed03cb31da4 100644 --- a/packages/pattern-info/src/prebuild.js +++ b/packages/pattern-info/src/prebuild.js @@ -12,6 +12,7 @@ const bruce = require('@freesewing/bruce').config const carlita = require('@freesewing/carlita').config const carlton = require('@freesewing/carlton').config const cathrin = require('@freesewing/cathrin').config +const charlie = require('@freesewing/charlie').config const cornelius = require('@freesewing/cornelius').config const florent = require('@freesewing/florent').config const florence = require('@freesewing/florence').config @@ -48,6 +49,7 @@ const patterns = { carlita, carlton, cathrin, + charlie, cornelius, florent, florence,