VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(wahid): Close front seam and include facing/lining when complete if false

Browse source
This commit is contained in:
Joost De Cock 2020-04-18 17:35:25 +02:00
parent 40db7ed31a
commit e4d69a9bf8
3 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/wahid/src/front.js
View file

@ -198,6 +198,10 @@ export default (part) => {
points.armholeHollowCp1 = points.armholeHollowCp2.rotate(180, points.armholeHollow) points.armholeHollowCp1 = points.armholeHollowCp2.rotate(180, points.armholeHollow)
} }
// Facing/Lining boundary (flb)
points.flbTop = points.neck.shiftFractionTowards(points.shoulder, 0.5)
points.flbCp = points.dartTop.shift(90, points.dartTop.dist(points.flbTop) / 2)
// Seam line // Seam line
delete paths.cutonfold delete paths.cutonfold
delete paths.saBase delete paths.saBase
@ -228,7 +232,7 @@ export default (part) => {
paths.hemBase = new Path().move(points.dartEnd).line(points.hem) paths.hemBase = new Path().move(points.dartEnd).line(points.hem)
} }
paths.dart = dartPath(part) paths.dart = dartPath(part)
paths.seam = paths.saBase.join(paths.dart).join(paths.hemBase).attr('class', 'fabric') paths.seam = paths.saBase.join(paths.dart).join(paths.hemBase).close().attr('class', 'fabric')
paths.saBase.render = false paths.saBase.render = false
paths.hemBase.render = false paths.hemBase.render = false
paths.dart.render = false paths.dart.render = false

24
packages/wahid/src/frontfacing.js
View file

@ -1,4 +1,4 @@
export default part => { export default (part) => {
let { let {
points, points,
Point, Point,
@ -16,8 +16,6 @@ export default part => {
for (let i of Object.keys(paths)) delete paths[i] for (let i of Object.keys(paths)) delete paths[i]
for (let i of Object.keys(snippets)) delete snippets[i] for (let i of Object.keys(snippets)) delete snippets[i]
if (!complete) return part
// Seam line // Seam line
paths.seam = new Path() paths.seam = new Path()
.move(points.dartStart) .move(points.dartStart)
@ -40,16 +38,18 @@ export default part => {
} }
paths.seam.close().attr('class', 'fabric') paths.seam.close().attr('class', 'fabric')
if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') if (complete) {
if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa')
points.title = new Point(points.dartWaistLeft.x / 2, points.waist.y) points.title = new Point(points.dartWaistLeft.x / 2, points.waist.y)
macro('title', { macro('title', {
nr: 3, nr: 3,
at: points.title, at: points.title,
title: 'frontFacing' title: 'frontFacing'
}) })
points.logo = points.closureTop.shiftFractionTowards(points.dartWaistLeft, 0.5) points.logo = points.closureTop.shiftFractionTowards(points.dartWaistLeft, 0.5)
snippets.logo = new Snippet('logo', points.logo) snippets.logo = new Snippet('logo', points.logo)
}
return part return part
} }

23
packages/wahid/src/frontlining.js
View file

@ -1,10 +1,9 @@
export default part => { export default (part) => {
let { points, paths, Path, options, macro, snippets, Snippet, complete, sa } = part.shorthand() let { points, paths, Path, options, macro, snippets, Snippet, complete, sa } = part.shorthand()
// Cleanup from Brian // Cleanup from Brian
for (let i of Object.keys(paths)) delete paths[i] for (let i of Object.keys(paths)) delete paths[i]
for (let i of Object.keys(snippets)) delete snippets[i] for (let i of Object.keys(snippets)) delete snippets[i]
if (!complete) return part
// Seam line // Seam line
paths.seam = new Path() paths.seam = new Path()
@ -24,15 +23,17 @@ export default part => {
paths.seam.curve(points.splitDartHemRightCp2, points.splitHemCp1, points.hem) paths.seam.curve(points.splitDartHemRightCp2, points.splitHemCp1, points.hem)
} else paths.seam.line(points.hem) } else paths.seam.line(points.hem)
if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') if (complete) {
points.title = points.armhole.shiftFractionTowards(points.dartTop, 0.5) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa')
macro('title', { points.title = points.armhole.shiftFractionTowards(points.dartTop, 0.5)
nr: 4, macro('title', {
at: points.title, nr: 4,
title: 'frontLining' at: points.title,
}) title: 'frontLining'
points.logo = points.dartWaistRight.shiftFractionTowards(points.waist, 0.5) })
snippets.logo = new Snippet('logo', points.logo) points.logo = points.dartWaistRight.shiftFractionTowards(points.waist, 0.5)
snippets.logo = new Snippet('logo', points.logo)
}
return part return part
} }