From cd881bbbe845cf596e1c6bce5742619bddc131a7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2019 16:53:09 +0100 Subject: [PATCH] sparkles: Paperless sleeves --- packages/jaeger/src/topsleeve.js | 88 +++++++++++++++++++++++++++++- packages/jaeger/src/undersleeve.js | 74 ++++++++++++++++++++++++- 2 files changed, 160 insertions(+), 2 deletions(-) diff --git a/packages/jaeger/src/topsleeve.js b/packages/jaeger/src/topsleeve.js index 106db7299b6..6b987deeaae 100644 --- a/packages/jaeger/src/topsleeve.js +++ b/packages/jaeger/src/topsleeve.js @@ -1,5 +1,5 @@ export default function(part) { - let { sa, snippets, Snippet, utils, store, complete, points, measurements, options, macro, Point, paths, Path } = part.shorthand(); + let { paperless, sa, snippets, Snippet, utils, store, complete, points, measurements, options, macro, Point, paths, Path } = part.shorthand(); // Vent let slope = 15; @@ -99,6 +99,92 @@ export default function(part) { }); if (sa) paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); + + if (paperless) { + macro("ld", { + from: points.tsWristLeft, + to: points.tsWristRight, + d: 15 + }); + macro("ld", { + from: points.tsWristLeft, + to: points.ventFoldRight, + d: 30 + }); + macro("ld", { + from: points.hemLeft, + to: points.ventRight, + d: -15 - sa + }); + macro("ld", { + from: points.hemLeft, + to: points.tsWristLeft, + d: 15 + sa + }); + macro("ld", { + from: points.tsWristRight, + to: points.ventSlopeStart, + d: 15 + }); + macro("ld", { + from: points.ventFoldRight, + to: points.ventSlopeEnd, + d: 15 + }); + macro("ld", { + from: points.tsWristRight, + to: points.ventFoldRight, + d: -15 + }); + macro("vd", { + from: points.ventRight, + to: points.top, + x: points.ventSlopeEnd.x + sa + 15 + }); + macro("vd", { + from: points.tsWristLeft, + to: points.tsElbowLeft, + x: points.tsLeftEdge.x - sa - 15 + }); + macro("vd", { + from: points.tsWristLeft, + to: points.tsLeftEdge, + x: points.tsLeftEdge.x - sa - 30 + }); + macro("vd", { + from: points.tsLeftEdge, + to: points.top, + x: points.tsLeftEdge.x - sa - 30 + }); + macro("vd", { + from: points.tsWristLeft, + to: points.top, + x: points.tsLeftEdge.x - sa - 45 + }); + macro("ld", { + from: points.tsLeftEdge, + to: points.tsRightEdge, + }); + macro("ld", { + from: points.tsElbowLeft, + to: points.elbowRight, + }); + macro("hd", { + from: points.tsLeftEdge, + to: points.top, + y: points.top.y - sa - 15 + }); + macro("hd", { + from: points.tsLeftEdge, + to: points.backPitchPoint, + y: points.top.y - sa - 30 + }); + macro("hd", { + from: points.tsLeftEdge, + to: points.tsRightEdge, + y: points.top.y - sa - 45 + }); + } } return part; diff --git a/packages/jaeger/src/undersleeve.js b/packages/jaeger/src/undersleeve.js index 915910ef743..ecc5e9b6d91 100644 --- a/packages/jaeger/src/undersleeve.js +++ b/packages/jaeger/src/undersleeve.js @@ -1,5 +1,5 @@ export default function(part) { - let { sa, snippets, Snippet, utils, store, complete, points, measurements, options, macro, Point, paths, Path } = part.shorthand(); + let { paperless, sa, snippets, Snippet, utils, store, complete, points, measurements, options, macro, Point, paths, Path } = part.shorthand(); // Vent let slope = 15; @@ -97,6 +97,78 @@ export default function(part) { }); if (sa) paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); + + if (paperless) { + macro("ld", { + from: points.usWristLeft, + to: points.usWristRight, + d: 15 + }); + macro("ld", { + from: points.usWristLeft, + to: points.ventFoldRight, + d: 30 + }); + macro("ld", { + from: points.hemLeft, + to: points.ventRight, + d: -15 - sa + }); + macro("ld", { + from: points.hemLeft, + to: points.usWristLeft, + d: 15 + sa + }); + macro("ld", { + from: points.usWristRight, + to: points.ventSlopeStart, + d: 15 + }); + macro("ld", { + from: points.ventFoldRight, + to: points.ventSlopeEnd, + d: 15 + }); + macro("ld", { + from: points.usWristRight, + to: points.ventFoldRight, + d: -15 + }); + macro("vd", { + from: points.usWristLeft, + to: points.usElbowLeft, + x: points.usLeftEdge.x - sa - 15 + }); + macro("vd", { + from: points.usWristLeft, + to: points.usLeftEdge, + x: points.usLeftEdge.x - sa - 30 + }); + macro("vd", { + from: points.usLeftEdge, + to: points.usTip, + x: points.usLeftEdge.x - sa - 30 + }); + macro("vd", { + from: points.usWristLeft, + to: points.usTip, + x: points.usLeftEdge.x - sa - 45 + }); + macro("ld", { + from: points.usElbowLeft, + to: points.elbowRight, + }); + macro("hd", { + from: points.usLeftEdge, + to: points.usTip, + y: points.usTip.y - sa - 15 + }); + macro("hd", { + from: points.usLeftEdge, + to: points.elbowRight, + y: points.usTip.y - sa - 30 + }); + } } return part;