VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge pull request #2127 from bobgeorgethe3rd/holmes

Browse source 
Holmes and Bee Config Updates
This commit is contained in:
Joost De Cock 2022-06-15 12:18:35 +02:00 • committed by GitHub
commit 7d699f875a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/bee/config/index.js
View file

@ -121,7 +121,7 @@ export default {
metric: [6, 13, 19, 25, 32, 38], metric: [6, 13, 19, 25, 32, 38],
imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1], imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
}, },
...pctBasedOn('bustSpan'), toAbs: (pct, { measurements }) => measurements.bustSpan * pct,
}, },
neckTieLength: { pct: 80, min: 70, max: 100 }, neckTieLength: { pct: 80, min: 70, max: 100 },
neckTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] }, neckTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] },
@ -135,7 +135,7 @@ export default {
metric: [6, 13, 19, 25, 32, 38], metric: [6, 13, 19, 25, 32, 38],
imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1], imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1],
}, },
...pctBasedOn('hpsToWaistFront'), toAbs: (pct, { measurements }) => measurements.hpsToWaistFront * pct,
}, },
bandTieLength: { pct: 35, min: 30, max: 50 }, bandTieLength: { pct: 35, min: 30, max: 50 },
bandTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] }, bandTieEnds: { dflt: 'straight', list: ['straight', 'pointed'] },

2
packages/holmes/config/index.js
View file

@ -37,7 +37,7 @@ export default {
metric: [6, 13, 19, 25, 32, 38, 44, 50], metric: [6, 13, 19, 25, 32, 38, 44, 50],
imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1, 44.45, 50.8], imperial: [6.35, 12.7, 19.05, 25.4, 31.75, 38.1, 44.45, 50.8],
}, },
...pctBasedOn('head'), toAbs: (pct, { measurements }) => measurements.head * pct,
}, },
lengthRatio: { pct: 55, min: 40, max: 60 }, lengthRatio: { pct: 55, min: 40, max: 60 },
gores: { count: 6, min: 4, max: 20 }, gores: { count: 6, min: 4, max: 20 },

11
packages/holmes/src/ear.js
View file

@ -26,11 +26,14 @@ export default function (part) {
points.bottomFlipped = points.bottom.flipX() points.bottomFlipped = points.bottom.flipX()
points.bottomC = points.bottom.shift(90, points.bottom.y - points.bottom.x) points.bottomC = points.bottom.shift(90, points.bottom.y - points.bottom.x)
points.bottomCFlipped = points.bottomC.flipX() points.bottomCFlipped = points.bottomC.flipX()
paths.seam = new Path() paths.saBase = new Path()
.move(points.bottom) .move(points.bottom)
.curve(points.bottomC, points.topC, points.top) .curve(points.bottomC, points.topC, points.top)
.curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped) .curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped)
paths.hem = new Path().move(points.bottomFlipped).line(points.bottom) .setRender(false)
paths.hemBase = new Path().move(points.bottomFlipped).line(points.bottom)
.setRender(false)
paths.seam = paths.saBase.join(paths.hemBase).close()
// Complete? // Complete?
if (complete) { if (complete) {
macro('grainline', { from: points.top, to: new Point(0, points.bottom.y) }) macro('grainline', { from: points.top, to: new Point(0, points.bottom.y) })
@ -45,9 +48,9 @@ export default function (part) {
snippets.buttonhole = new Snippet('buttonhole-start', points.buttonhole).attr('data-scale', 2) snippets.buttonhole = new Snippet('buttonhole-start', points.buttonhole).attr('data-scale', 2)
} }
if (sa) { if (sa) {
paths.sa = paths.seam paths.sa = paths.saBase
.offset(sa) .offset(sa)
.join(paths.hem.offset(sa * 2)) .join(paths.hemBase.offset(sa * 2))
.attr('class', 'fabric sa') .attr('class', 'fabric sa')
.close() .close()
} }

38
packages/holmes/src/visor.js
View file

@ -47,34 +47,30 @@ export default function (part) {
points.ex1CFlipped = points.ex1C.flipX() points.ex1CFlipped = points.ex1C.flipX()
points.ex2CFlipped = points.ex2C.flipX() points.ex2CFlipped = points.ex2C.flipX()
paths.seam = new Path() paths.saInner = new Path ()
.move(points.in2Flipped) .move(points.in2)
.curve(points.in2CFlipped, points.in1CFlipped, points.in1) .curve(points.in2C, points.in1C, points.in1)
.curve(points.in1C, points.in2C, points.in2) .curve(points.in1CFlipped, points.in2CFlipped, points.in2Flipped)
.curve(points.ex2C, points.ex1C, points.ex1) .setRender(false)
.curve(points.ex1CFlipped, points.ex2CFlipped, points.in2Flipped)
.close() paths.saOuter = new Path()
.move(points.in2Flipped)
.curve(points.ex2CFlipped, points.ex1CFlipped, points.ex1)
.curve(points.ex1C, points.ex2C, points.in2)
.setRender(false)
paths.seam = paths.saOuter.join(paths.saInner).close()
// Complete? // Complete?
if (complete) { if (complete) {
macro('grainline', { from: points.in1, to: points.ex1 }) macro('grainline', { from: points.in1, to: points.ex1 })
macro('title', { at: points.ex1.shift(45, 20), nr: 2, title: 'visor', scale: 0.4 }) macro('title', { at: points.ex1.shift(45, 20), nr: 2, title: 'visor', scale: 0.4 })
if (sa) { if (sa) {
paths.saInner = new Path() points.sa1 = new Point(points.in2.x + sa, paths.saInner.offset(sa*2).start().y)
.move(points.in2Flipped) points.sa2 = points.sa1.flipX(points.in1)
.curve(points.in2CFlipped, points.in1CFlipped, points.in1) paths.sa = paths.saOuter.offset(sa)
.curve(points.in1C, points.in2C, points.in2)
.offset(sa * -2)
.attr('class', 'fabric sa')
points.sa1 = new Point(points.in2Flipped.x - sa, paths.saInner.start().y)
points.sa2 = new Point(points.in2.x + sa, paths.saInner.start().y)
paths.sa = new Path()
.move(points.in2)
.curve(points.ex2C, points.ex1C, points.ex1)
.curve(points.ex1CFlipped, points.ex2CFlipped, points.in2Flipped)
.offset(sa * -1)
.line(points.sa1) .line(points.sa1)
.join(paths.saInner) .join(paths .saInner.offset(sa * 2))
.line(points.sa2) .line(points.sa2)
.close() .close()
.attr('class', 'fabric sa') .attr('class', 'fabric sa')