VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge branch 'develop' of github.com:freesewing/freesewing into develop

Browse source
This commit is contained in:
Joost De Cock 2022-01-19 16:19:42 +01:00
commit 84ae63c97c
9 changed files with 81 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

135
packages/bee/config/index.js
View file

@ -6,34 +6,18 @@ export default {
name: 'bee',
version,
design: 'PrudenceRabbit',
code: ['bobgeorgethe3rd'],
code: 'bobgeorgethe3rd',
department: 'tops',
type: 'pattern',
difficulty: 3,
optionGroups: {
fit: [
'topDepth',
'bottomCupDepth',
'sideDepth',
'sideCurve',
'frontCurve',
],
style: [
'ties',
'neckTieWidth',
'neckTieLength',
'neckTieEnds',
'neckTieColours',
'bandTieWidth',
'bandTieLength',
'bandTieEnds',
'bandTieColours',
'crossBackTies',
'bandLength',
],
fit: ['chestEase', 'waistEase', 'bustSpanEase','topDepth','bottomCupDepth','sideDepth','sideCurve','frontCurve','bellaGuide'],
style: ['ties','neckTieWidth','neckTieLength','neckTieEnds','neckTieColours','bandTieWidth','bandTieLength','bandTieEnds','bandTieColours','crossBackTies','bandLength'],
advanced: [
{ bella: [ 'chestEase', 'waistEase', 'bustSpanEase', 'bellaGuide' ] },
],
{bellaDarts:['backDartHeight']},
{bellaArmhole:['armholeDepth',
'frontArmholePitchDepth']},
{bellaAdvanced:['frontShoulderWidth', 'highBustWidth']}],
},
measurements: [
'highBust',
@ -48,22 +32,23 @@ export default {
'hpsToWaistBack',
'shoulderToShoulder',
'shoulderSlope',
'bustPointToUnderbust',
"bustPointToUnderbust"
// FIXME: Measurement from waist up to armhole (for sleeveless)
],
dependencies: {
frontSideDart: 'back',
bandTie: 'cup',
cup: 'neckTie',
bandTie: 'cup',
cup:'neckTie',
},
inject: { cup: 'frontSideDart' },
hide: ['frontSideDart', 'back'],
inject: {cup: 'frontSideDart'},
hide: ['frontSideDart','back'],
parts: [
'back',
'frontSideDart',
'cup',
'neckTie',
'bandTie',
'cup',
'neckTie',
'bandTie',
// 'frontShoulderDart'
],
options: {
// Constants
@ -75,63 +60,57 @@ export default {
backDartLocation: 0.145,
backCenterWaistReduction: 0.35,
collarFactor: 0.19,
backNeckCutout: 0.06,
backHemSlope: 2.5,
backArmholeSlant:5,
backArmholeCurvature:0.63,
frontArmholeCurvature: 0.63,
fullChestEaseReduction: 0.04,
backArmholePitchDepth: 0.35,
bustDartLength: 1,
waistDartLength: 1,
bustDartCurve: 1,
// Percentages
backNeckCutout: { pct: 6, min: 3, max: 9 },
//Bella Fit
waistEase: { pct: 5, min: 1, max: 20 },
chestEase: { pct: 11, min: 5, max: 20 },
bustSpanEase: { pct: 10, min: 0, max: 20 },
//Bella Advanced
backDartHeight: { pct: 46, min: 38, max: 54 },
armholeDepth: { pct: 44, min: 38, max: 46 },
backHemSlope: { deg: 2.5, min: 0, max: 5 },
backArmholeSlant: { deg: 5, min: 1, max: 9 },
backArmholeCurvature: { pct: 63, min: 50, max: 85 },
frontArmholeCurvature: { pct: 63, min: 50, max: 85 },
fullChestEaseReduction: { pct: 4, min: 0, max: 8 },
frontShoulderWidth: { pct: 95, max: 98, min: 92 },
frontArmholePitchDepth: { pct: 29, max: 31, min: 27 },
backArmholePitchDepth: { pct: 35, max: 40, min: 30 },
highBustWidth: { pct: 86, max: 92, min: 80 },
bustDartLength: { pct: 90, min: 75, max: 100 },
waistDartLength: { pct: 90, min: 75, max: 95 },
bustDartCurve: { pct: 100, min: 0, max: 100 },
// Bikini Top
topDepth: { pct: 54, min: 50, max: 80 },
//neckTieWidth: { mm: 13, min: 6, max: 30},
neckTieWidth: {
pct: 6,
min: 2,
max: 18,
snap: {
metric: [5, 7.5, 10, 12.5, 15, 20, 25, 30, 35, 40, 45, 50],
imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
// Bikini Top
topDepth: { pct: 54, min: 50, max: 80 },
//neckTieWidth: { mm: 13, min: 6, max: 30},
neckTieWidth: { pct: 6, min: 2, max: 18,
snap: {
metric: [ 6, 13, 19, 25, 32, 38 ],
imperial: [ 6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
},
...pctBasedOn('bustSpan'),
},
neckTieLength: { pct: 80, min: 70, max: 100 },
neckTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] },
neckTieColours: { dflt: 'one', list: ['one', 'two'] },
//bandTieWidth: { mm: 13, min: 6, max: 30 },
bandTieWidth: {
pct: 3,
min: 1,
max: 9,
snap: {
metric: [5, 7.5, 10, 12.5, 15, 20, 25, 30, 35, 40, 45, 50],
imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
...pctBasedOn('bustSpan')},
neckTieLength: { pct: 80, min: 70, max: 100 },
neckTieEnds: {dflt:"straight", list:["straight","pointed"] },
neckTieColours: {dflt:"one", list:["one","two"] },
//bandTieWidth: { mm: 13, min: 6, max: 30 },
bandTieWidth: { pct: 3, min: 1, max: 9,
snap: {
metric: [ 6, 13, 19, 25, 32, 38 ],
imperial: [ 6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
},
...pctBasedOn('hpsToWaistFront'),
},
bandTieLength: { pct: 35, min: 30, max: 50 },
bandTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] },
bandTieColours: { dflt: 'one', list: ['one', 'two'] },
bottomCupDepth: { pct: 8, min: 0, max: 20 },
sideDepth: { pct: 20.6, min: 0, max: 30 },
sideCurve: { pct: 0, min: -50, max: 50 },
frontCurve: { pct: 0, min: -50, max: 50 },
bellaGuide: { bool: false },
ties: { bool: true },
crossBackTies: { bool: false },
bandLength: { pct: 85, min: 75, max: 90 },
...pctBasedOn('hpsToWaistFront')},
bandTieLength: { pct: 35, min: 30, max: 50 },
bandTieEnds: {dflt:"straight", list:["straight","pointed"] },
bandTieColours: {dflt:"one", list:["one","two"] },
bottomCupDepth: { pct: 8, min: 0, max: 20 },
sideDepth: { pct: 20.6, min: 0, max: 30 },
sideCurve: { pct: 0, min: -50, max: 50 },
frontCurve: { pct: 0, min: -50, max: 50 },
bellaGuide: { bool : false },
ties: { bool : true },
crossBackTies: { bool : false },
bandLength: { pct: 85, min: 75, max: 90 },
},
}

3
packages/i18n/src/locales/de/options/benjamin.yml
View file

@ -23,3 +23,6 @@ endStyle:
collarEase:
title: Kragen Zugabe
description: Die Menge an Zugabe an deinem Hals
ribbonWidth:
title: Ribbon width
description: Width of the ribbon

3
packages/i18n/src/locales/es/options/benjamin.yml
View file

@ -23,3 +23,6 @@ endStyle:
collarEase:
title: Facilidad de cuello
description: The amount of ease at your neck
ribbonWidth:
title: Ribbon width
description: Width of the ribbon

3
packages/i18n/src/locales/fr/options/benjamin.yml
View file

@ -23,3 +23,6 @@ endStyle:
collarEase:
title: Aisance du col
description: La quantité d'aisance à votre cou
ribbonWidth:
title: Ribbon width
description: Width of the ribbon

3
packages/i18n/src/locales/nl/options/benjamin.yml
View file

@ -23,3 +23,6 @@ endStyle:
collarEase:
title: Overwijdte kraag
description: The amount of ease at your neck
ribbonWidth:
title: Ribbon width
description: Width of the ribbon