VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge pull request #7086 from bobgeorgethe3rd/revert-7012-fix/sandy

Browse source 
Revert "fix(sandy): fix seam allowance construction to work with new ringsector changes"
This commit is contained in:
Joost De Cock 2024-09-28 15:14:02 +02:00 • committed by GitHub
commit 36832d156d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
designs/sandy/src/skirt.mjs
View file

@ -113,9 +113,13 @@ function sandySkirt({
if (sa) { if (sa) {
paths.hemBase = new Path() paths.hemBase = new Path()
.move(points.ex2Flipped) .move(points.ex2Flipped)
.circleSegment(angle, points.center) .curve(points.ex2cFlipped, points.ex1cFlipped, points.ex1)
.curve(points.ex1c, points.ex2c, points.ex2)
.offset(store.get('fullLength') * options.lengthBonus * options.hemWidth) .offset(store.get('fullLength') * options.lengthBonus * options.hemWidth)
paths.saBase = new Path().move(points.in2).circleSegment(-angle, points.center) paths.saBase = new Path()
.move(points.in2)
.curve(points.in2c, points.in1c, points.in1)
.curve(points.in1cFlipped, points.in2cFlipped, points.in2Flipped)
if (!options.seamlessFullCircle) if (!options.seamlessFullCircle)
paths.saBase = new Path().move(points.ex2).line(points.ex2).join(paths.saBase) paths.saBase = new Path().move(points.ex2).line(points.ex2).join(paths.saBase)

25
designs/tristan/src/peplumFront.mjs
View file

@ -17,10 +17,9 @@ export const CreateShape = ({
const double = const double =
type == options.zipperLocation || (true == options.lacing && type == options.lacingLocation) type == options.zipperLocation || (true == options.lacing && type == options.lacingLocation)
const angle = (options.peplumFullness / 2) * ratio * (double ? 0.5 : 1)
macro('ringsector', { macro('ringsector', {
id: type + 'Peblum', id: type + 'Peblum',
angle: angle, angle: (options.peplumFullness / 2) * ratio * (double ? 0.5 : 1),
insideRadius: radius, insideRadius: radius,
outsideRadius: radius + width, outsideRadius: radius + width,
rotate: false, rotate: false,
@ -53,9 +52,27 @@ export const CreateShape = ({
.join( .join(
new Path() new Path()
.move(points['__macro_ringsector_' + type + 'Peblum_ex2Flipped']) .move(points['__macro_ringsector_' + type + 'Peblum_ex2Flipped'])
.circleSegment(angle, points['__macro_ringsector_' + type + 'Peblum_center']) .curve(
points['__macro_ringsector_' + type + 'Peblum_ex2cFlipped'],
points['__macro_ringsector_' + type + 'Peblum_ex1cFlipped'],
points['__macro_ringsector_' + type + 'Peblum_ex1']
)
.curve(
points['__macro_ringsector_' + type + 'Peblum_ex1c'],
points['__macro_ringsector_' + type + 'Peblum_ex2c'],
points['__macro_ringsector_' + type + 'Peblum_ex2']
)
.line(points['__macro_ringsector_' + type + 'Peblum_in2']) .line(points['__macro_ringsector_' + type + 'Peblum_in2'])
.circleSegment(-angle, points['__macro_ringsector_' + type + 'Peblum_center']) .curve(
points['__macro_ringsector_' + type + 'Peblum_in2c'],
points['__macro_ringsector_' + type + 'Peblum_in1c'],
points['__macro_ringsector_' + type + 'Peblum_in1']
)
.curve(
points['__macro_ringsector_' + type + 'Peblum_in1cFlipped'],
points['__macro_ringsector_' + type + 'Peblum_in2cFlipped'],
points['__macro_ringsector_' + type + 'Peblum_in2Flipped']
)
.offset(sa) .offset(sa)
) )
.line(points['__macro_ringsector_' + type + 'Peblum_in2Flipped']) .line(points['__macro_ringsector_' + type + 'Peblum_in2Flipped'])