VSinerva/freesewing
1
0
Fork 0
Code Activity

feat(simon[e]): Added ffsa option for flet-felled seam allowance

Browse source 
Closes #1251
This commit is contained in:
Joost De Cock 2021-08-15 18:41:38 +02:00
parent 8bf3119e03
commit b106a2b4dd
6 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/simon/config/index.js
View file

@ -78,6 +78,7 @@ export default {
'boxPleatWidth',
'boxPleatFold',
'backDartShaping',
'ffsa',
{
sleevecap: [
'sleevecapEase',
@ -225,6 +226,7 @@ export default {
// s3 is short for Shoulder Seam Shift
s3Collar: { pct: 0, min: -100, max: 100 },
s3Armhole: { pct: 0, min: -100, max: 100 },
ffsa: {pct: 150, min: 100, max:200 },
sleevecapEase: { pct: 0, min: 0, max: 3 },
sleevecapTopFactorX: { pct: 50, min: 25, max: 75 },
sleevecapTopFactorY: { pct: 100, min: 35, max: 165 },

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

@ -122,7 +122,7 @@ export default (part) => {
})
if (sa) {
paths.saFrench = paths.saBase.offset(sa * 2).attr('class', 'fabric sa')
paths.saFrench = paths.saBase.offset(sa * options.ffsa).attr('class', 'fabric sa')
paths.saFromArmhole = paths.saBaseFromArmhole.offset(sa).attr('class', 'fabric sa')
paths.hemSa = paths.hemBase.offset(sa * 3).attr('class', 'fabric sa')
paths.saConnect = new Path()

22
packages/simon/src/shared.js
View file

@ -216,27 +216,27 @@ export const frontDimensions = (part, side = 'left') => {
macro('vd', {
from: points.armhole,
to: points.armholePitch,
x: points.armhole.x + (15 + sa * 2) * factor,
x: points.armhole.x + (15 + sa * options.ffsa) * factor,
})
macro('vd', {
from: points.armhole,
to: points.s3ArmholeSplit,
x: points.armhole.x + (30 + sa * 2) * factor,
x: points.armhole.x + (30 + sa * options.ffsa) * factor,
})
macro('vd', {
from: points.armhole,
to: points.s3CollarSplit,
x: points.armhole.x + (45 + sa * 2) * factor,
x: points.armhole.x + (45 + sa * options.ffsa) * factor,
})
macro('vd', {
from: points.waist,
to: points.armhole,
x: points.armhole.x + (15 + sa * 2) * factor,
x: points.armhole.x + (15 + sa * options.ffsa) * factor,
})
macro('vd', {
from: points.hips,
to: points.armhole,
x: points.armhole.x + (30 + sa * 2) * factor,
x: points.armhole.x + (30 + sa * options.ffsa) * factor,
})
macro('ld', {
from: points.cfWaist,
@ -246,22 +246,22 @@ export const frontDimensions = (part, side = 'left') => {
macro('vd', {
from: points.bballStart,
to: points.bballEnd,
x: points.hips.x + (15 + 2 * sa) * factor,
x: points.hips.x + (15 + options.ffsa * sa) * factor,
})
macro('vd', {
from: points.bballStart,
to: points.hips,
x: points.hips.x + (30 + 2 * sa) * factor,
x: points.hips.x + (30 + options.ffsa * sa) * factor,
})
macro('vd', {
from: points.bballStart,
to: points.armhole,
x: points.hips.x + (45 + 2 * sa) * factor,
x: points.hips.x + (45 + options.ffsa * sa) * factor,
})
macro('vd', {
from: points.bballStart,
to: points.s3CollarSplit,
x: points.hips.x + (60 + 2 * sa) * factor,
x: points.hips.x + (60 + options.ffsa * sa) * factor,
})
macro('hd', {
from: points.bballStart,
@ -293,12 +293,12 @@ export const frontDimensions = (part, side = 'left') => {
macro('vd', {
from: points.hem,
to: points.armhole,
x: points.armhole.x + (45 + 2 * sa) * factor,
x: points.armhole.x + (45 + options.ffsa * sa) * factor,
})
macro('vd', {
from: points.hem,
to: points.s3CollarSplit,
x: points.armhole.x + (60 + 2 * sa) * factor,
x: points.armhole.x + (60 + options.ffsa * sa) * factor,
})
}
}

18
packages/simon/src/sleeve.js
View file

@ -145,7 +145,7 @@ export default (part) => {
macro('grainline', { from: points.cuffMid, to: points.sleeveTip })
if (sa) {
paths.sa = paths.frenchBase.offset(sa * 2)
paths.sa = paths.frenchBase.offset(sa * options.ffsa)
paths.frenchSa = paths.sa.clone()
paths.sa = paths.sa
.join(paths.saBase.offset(sa))
@ -164,27 +164,27 @@ export default (part) => {
macro('hd', {
from: points.backNotch,
to: points.sleeveTip,
y: points.sleeveTip.y - 15 - sa * 2,
y: points.sleeveTip.y - 15 - sa * options.ffsa,
})
macro('hd', {
from: points.sleeveTip,
to: points.frontNotch,
y: points.sleeveTip.y - 15 - sa * 2,
y: points.sleeveTip.y - 15 - sa * options.ffsa,
})
macro('hd', {
from: points.bicepsLeft,
to: points.sleeveTip,
y: points.sleeveTip.y - 30 - sa * 2,
y: points.sleeveTip.y - 30 - sa * opions.ffsa,
})
macro('hd', {
from: points.sleeveTip,
to: points.bicepsRight,
y: points.sleeveTip.y - 30 - sa * 2,
y: points.sleeveTip.y - 30 - sa * options.ffsa,
})
macro('hd', {
from: points.bicepsLeft,
to: points.bicepsRight,
y: points.sleeveTip.y - 45 - sa * 2,
y: points.sleeveTip.y - 45 - sa * options.ffsa,
})
macro('pd', {
path: new Path()
@ -200,17 +200,17 @@ export default (part) => {
macro('vd', {
from: points.wristRight,
to: points.bicepsRight,
x: points.bicepsRight.x + 15 + sa * 2,
x: points.bicepsRight.x + 15 + sa * options.ffsa,
})
macro('vd', {
from: points.bicepsRight,
to: points.frontNotch,
x: points.bicepsRight.x + 15 + sa * 2,
x: points.bicepsRight.x + 15 + sa * options.ffsa,
})
macro('vd', {
from: points.bicepsRight,
to: points.sleeveTip,
x: points.bicepsRight.x + 30 + sa * 2,
x: points.bicepsRight.x + 30 + sa * options.ffsa,
})
macro('vd', {
from: points.bicepsLeft,

2
packages/simone/config/index.js
View file

@ -83,6 +83,7 @@ export default {
'bustDartAngle',
'bustDartLength',
'frontDartLength',
'ffsa',
{
sleevecap: [
'sleevecapEase',
@ -234,6 +235,7 @@ export default {
shoulderEase: { pct: 2, min: 0, max: 15 },
shoulderSlopeReduction: { pct: 0, min: 0, max: 8 },
yokeHeight: { pct: 55, min: 10, max: 90 },
ffsa: {pct: 150, min: 100, max:200 },
// s3 is short for Shoulder Seam Shift
s3Collar: { pct: 0, min: -100, max: 100 },
s3Armhole: { pct: 0, min: -100, max: 100 },

2
packages/simone/src/fba-front.js
View file

@ -361,7 +361,7 @@ export default (part) => {
paths.saBase.render = false
if (complete && sa) {
paths.saFrench = paths.saBase.offset(sa * 2).attr('class', 'fabric sa')
paths.saFrench = paths.saBase.offset(sa * options.ffsa).attr('class', 'fabric sa')
paths.saFromArmhole = paths.saBaseFromArmhole.offset(sa).attr('class', 'fabric sa')
paths.hemSa = paths.hemBase.offset(sa * 3).attr('class', 'fabric sa')
paths.saConnect = new Path()