1
0
Fork 0

Merge pull request #2542 from BenJamesBen/2516-breanna-sleeve-notches

fix (breanna): Large shoulder slope can cause an error. Fixes #2516
This commit is contained in:
Joost De Cock 2022-08-06 15:15:43 +02:00 committed by GitHub
commit 6a8545d4b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions

View file

@ -3,6 +3,12 @@
## Unreleased
### breanna
#### Fixed
- Fixed bug where a large shoulder slope could cause an error. Fixes [#2516](https://github.com/freesewing/freesewing/issues/2516)
### brian
#### Fixed

View file

@ -18,6 +18,9 @@ Unreleased:
- migrated `waistbandWidth` option from `mm` to snapped `pct` option
Fixed:
breanna:
- Fixed bug where a large shoulder slope could cause an error.
Fixes [#2516](https://github.com/freesewing/freesewing/issues/2516)
brian:
- Make s3 options sticky to zero below 10% to avoid path split issues.
Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249)

View file

@ -65,7 +65,9 @@ export default (part) => {
if (q1Len === frontTarget) points.frontNotch = points.capQ1.clone()
else if (q1Len > frontTarget) points.frontNotch = q1.shiftAlong(frontTarget)
else {
let q2 = new Path().move(points.capQ1).curve(points.capQ1Cp2, points.capQ2Cp1, points.capQ2)
let q2 = new Path().move(points.capQ1)
.curve(points.capQ1Cp2, points.capQ2Cp1, points.capQ2)
.curve(points.capQ2Cp2, points.capQ3Cp1, points.capQ3)
points.frontNotch = q2.shiftAlong(frontTarget - q1Len)
}
let q4 = new Path().move(points.bicepsLeft)._curve(points.capQ4Cp2, points.capQ4)
@ -74,7 +76,9 @@ export default (part) => {
if (q4Len === backTarget) points.backNotch = points.capQ4.clone()
else if (q4Len > backTarget) points.backNotch = q4.shiftAlong(backTarget)
else {
let q3 = new Path().move(points.capQ4).curve(points.capQ4Cp1, points.capQ3Cp2, points.capQ3)
let q3 = new Path().move(points.capQ4)
.curve(points.capQ4Cp1, points.capQ3Cp2, points.capQ3)
.curve(points.capQ3Cp1, points.capQ2Cp2, points.capQ2)
points.backNotch = q3.shiftAlong(backTarget - q4Len)
}
snippets.frontNotch = new Snippet('notch', points.frontNotch)