VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(wahid): Prevent facing/lining overlap. Closes #2233

Browse source
This commit is contained in:
Joost De Cock 2022-07-09 16:49:30 +02:00
parent 46d9f19e7b
commit 02ba417a6e
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/changelog.yaml
View file

@ -11,6 +11,9 @@ Unreleased:
brian: brian:
- Make s3 options sticky to zero below 10% to avoid path split issues. - Make s3 options sticky to zero below 10% to avoid path split issues.
Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249) Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249)
wahid:
- Prevent facing/lining overlap when shoulders get very narrow
fixes [#2233](https://github.com/freesewing/freesewing/issues/2233)
2.21.3: 2.21.3:
date: 2022-07-02 date: 2022-07-02

7
designs/wahid/src/front.js
View file

@ -208,7 +208,8 @@ export default (part) => {
// Facing/Lining boundary (flb) // Facing/Lining boundary (flb)
points.flbTop = points.neck.shiftFractionTowards(points.shoulder, 0.5) points.flbTop = points.neck.shiftFractionTowards(points.shoulder, 0.5)
points.flbCp = points.dartTop.shift(90, points.dartTop.dist(points.flbTop) / 2) points.flbCp = points.dartTop.shift(-90, points.armholePitch.dy(points.flbTop) / 2)
points.flbCpTop = points.flbTop.shiftTowards(points.neck, points.flbTop.dy(points.armholePitch)).rotate(90, points.flbTop)
// Seam line // Seam line
delete paths.cutonfold delete paths.cutonfold
@ -274,11 +275,9 @@ export default (part) => {
} }
// Facing/Lining boundary (flb) // 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)
paths.flbFacing = new Path() paths.flbFacing = new Path()
.move(points.dartTop) .move(points.dartTop)
.curve_(points.flbCp, points.flbTop) .curve(points.flbCp, points.flbCpTop, points.flbTop)
.attr('class', 'fabric') .attr('class', 'fabric')
paths.flbLining = paths.flbFacing.clone().attr('class', 'lining dashed') paths.flbLining = paths.flbFacing.clone().attr('class', 'lining dashed')

2
designs/wahid/src/frontfacing.js
View file

@ -12,7 +12,7 @@ export default (part) => {
.line(points.dartHipLeft) .line(points.dartHipLeft)
.curve(points.dartHipLeftCpTop, points.dartWaistLeftCpBottom, points.dartWaistLeft) .curve(points.dartHipLeftCpTop, points.dartWaistLeftCpBottom, points.dartWaistLeft)
.curve_(points.dartWaistLeftCpTop, points.dartTop) .curve_(points.dartWaistLeftCpTop, points.dartTop)
.curve_(points.flbCp, points.flbTop) .curve(points.flbCp, points.flbCpTop, points.flbTop)
.line(points.neck) .line(points.neck)
.curve(points.neckCp2, points.closureTopCp1, points.closureTop) .curve(points.neckCp2, points.closureTopCp1, points.closureTop)
if (options.hemStyle === 'classic') { if (options.hemStyle === 'classic') {

2
designs/wahid/src/frontlining.js
View file

@ -15,7 +15,7 @@ export default (part) => {
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch) .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
.curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
.line(points.flbTop) .line(points.flbTop)
._curve(points.flbCp, points.dartTop) .curve(points.flbCpTop, points.flbCp, points.dartTop)
._curve(points.dartWaistRightCpTop, points.dartWaistRight) ._curve(points.dartWaistRightCpTop, points.dartWaistRight)
.curve(points.dartWaistRightCpBottom, points.dartHipRightCpTop, points.dartHipRight) .curve(points.dartWaistRightCpBottom, points.dartHipRightCpTop, points.dartHipRight)
.line(points.dartEnd) .line(points.dartEnd)