1
0
Fork 0

Merge pull request #2471 from freesewing/issue-2400

fix(simon): Handle boxpleat issue in yoke. Fixes #2400
This commit is contained in:
Joost De Cock 2022-07-25 12:08:50 +02:00 committed by GitHub
commit 3231c4744e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions

View file

@ -33,6 +33,12 @@
- Fix hem allowance. Closes [#2350](https://github.com/freesewing/freesewing/issues/2350)
### simon
#### Fixed
- Fix issue with boxPleat and yoke Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400)
### simone
#### Fixed

View file

@ -20,6 +20,9 @@ Unreleased:
brian:
- Make s3 options sticky to zero below 10% to avoid path split issues.
Fixes [#2249](https://github.com/freesewing/freesewing/issues/2249)
simon:
- Fix issue with boxPleat and yoke
Fixes [#2400](https://github.com/freesewing/freesewing/issues/2400)
simone:
- Don't do a negative FBA from there's no need for an FBA
Fixes [#2121](https://github.com/freesewing/freesewing/issues/2121)

View file

@ -129,6 +129,7 @@ export default (part) => {
} else points.cbTop = points.cbYoke
// Box pleat
points.armholeYokeSplitPreBoxpleat = points.armholeYokeSplit.clone()
if (options.boxPleat) {
points.boxPleatLeft = points.cbTop.shift(0, store.get('boxPleatWidth') / 2)
points.boxPleatMid = points.boxPleatLeft.shift(0, store.get('boxPleatFold'))

View file

@ -7,7 +7,7 @@ export default (part) => {
}
// Paths
paths.saBase = new Path().move(points.cbYoke).line(points.armholeYokeSplit)
paths.saBase = new Path().move(points.cbYoke).line(points.armholeYokeSplitPreBoxpleat)
if (options.yokeHeight > 0) paths.saBase = paths.saBase.join(paths.backArmholeYoke)
paths.saBase = paths.saBase.line(points.s3CollarSplit).join(paths.backCollar)
if (options.splitYoke) paths.saBase = paths.saBase.line(points.cbYoke).close()
@ -29,6 +29,7 @@ export default (part) => {
delete snippets.armholePitchNotch
delete snippets.collarNotch
delete snippets.shoulderNotch
snippets.sleevecapNotch = new Snippet('notch', points.armholeYokeSplitPreBoxpleat)
points.title = new Point(points.neck.x, points.cbYoke.y / 3)
macro('title', { at: points.title, nr: 4, title: 'yoke', scale: 0.8 })
points.logo = points.title.shift(-90, 50)