diff --git a/packages/carlton/src/back.js b/packages/carlton/src/back.js index 2ec4807cc7e..966ec7d7c51 100644 --- a/packages/carlton/src/back.js +++ b/packages/carlton/src/back.js @@ -1,6 +1,6 @@ import { calculateRatios } from './shared' -export default function(part) { +export default function (part) { let { paperless, sa, @@ -58,10 +58,7 @@ export default function(part) { // Store collar length store.set( 'backCollarLength', - new Path() - .move(points.cbNeck) - ._curve(points.neckCp2, points.neck) - .length() + new Path().move(points.cbNeck)._curve(points.neckCp2, points.neck).length() ) // Clean up @@ -86,11 +83,7 @@ export default function(part) { .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder) .line(points.neck) .curve_(points.neckCp2, points.cbNeck) - paths.seam = paths.seam1 - .join(paths.dart) - .join(paths.seam2) - .close() - .attr('class', 'fabric') + paths.seam = paths.seam1.join(paths.dart).join(paths.seam2).close().attr('class', 'fabric') paths.backStay = new Path() .move(points.bpStart) @@ -105,8 +98,8 @@ export default function(part) { if (complete) { macro('sprinkle', { - snippet: 'notch', - on: ['armholePitch', 'bpTriangleTip'] + snippet: 'bnotch', + on: ['shoulder', 'bpTriangleTip'] }) macro('grainline', { diff --git a/packages/carlton/src/belt.js b/packages/carlton/src/belt.js index 54ab92ac42c..b6f72f1b119 100644 --- a/packages/carlton/src/belt.js +++ b/packages/carlton/src/belt.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -60,6 +60,10 @@ export default function(part) { }) points.logo = new Point(points.bottomRight.x * 0.75, points.bottomRight.y * 0.65) snippets.logo = new Snippet('logo', points.logo) + snippets.waistNotch = new Snippet( + 'notch', + points.bottomRight.shiftFractionTowards(points.topRight, 0.5) + ) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') diff --git a/packages/carlton/src/front.js b/packages/carlton/src/front.js index d0a0f4ea1ae..85627b898e3 100644 --- a/packages/carlton/src/front.js +++ b/packages/carlton/src/front.js @@ -1,6 +1,6 @@ import { calculateRatios } from './shared' -export default function(part) { +export default function (part) { let { paperless, sa, @@ -222,10 +222,7 @@ export default function(part) { paths.hemBase = new Path().move(points.flbHem).line(points.hem) paths.saBase.render = false paths.hemBase.render = false - paths.seam = paths.saBase - .join(paths.hemBase) - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.join(paths.hemBase).close().attr('class', 'fabric') paths.rollLine = new Path() .move(points.rollLineStart) @@ -237,10 +234,7 @@ export default function(part) { .curve(points.button3Right, points.waistCp2, points.armhole) .attr('class', 'canvas lashed') - paths.flb = new Path() - .move(points.flbHem) - .line(points.flbTop) - .attr('class', 'lining lashed') + paths.flb = new Path().move(points.flbHem).line(points.flbTop).attr('class', 'lining lashed') paths.pocket = new Path().move(points.pocketTopLeft) if (options.pocketRadius > 0) { @@ -312,7 +306,7 @@ export default function(part) { macro('sprinkle', { snippet: 'notch', - on: ['armholePitch', 'cfNeck', 'rollLineStart', 'waist', 'seat'] + on: ['shoulder', 'cfNeck', 'rollLineStart', 'waist', 'seat'] }) points.logo = new Point(points.chestPocketTopRight.x, points.armhole.y) diff --git a/packages/carlton/src/topsleeve.js b/packages/carlton/src/topsleeve.js index d8863f0bfe1..bca2772e9e5 100644 --- a/packages/carlton/src/topsleeve.js +++ b/packages/carlton/src/topsleeve.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -10,6 +10,7 @@ export default function(part) { macro, paths, Path, + Snippet, snippets } = part.shorthand() @@ -59,9 +60,9 @@ export default function(part) { macro('scalebox', { at: points.tsWristLeftHelperTop }) delete snippets.logo - if (sa) { - paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') - } + if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') + + snippets.sleeveTop = new Snippet('notch', points.top) if (paperless) { macro('ld', { diff --git a/packages/carlton/src/undersleeve.js b/packages/carlton/src/undersleeve.js index 7ac202c1176..502b350c68d 100644 --- a/packages/carlton/src/undersleeve.js +++ b/packages/carlton/src/undersleeve.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -54,9 +54,7 @@ export default function(part) { to: new Point(points.top.x, points.usLeftEdge.y) }) - if (sa) { - paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') - } + if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') if (paperless) { macro('ld', {