sparkles: Paperless sleeve

packages/simon/config/config.js

@@ -130,8 +130,8 @@ export default {
     collarEase: { pct: 3.5, min: 0, max: 10 },
     collarGap: { pct: 3, min: 0, max: 6 },
     collarRoll: { pct: 3, min: 0, max: 6 },
-    cuffDrape: { pct: 10, min: 0, max: 20 },
-    cuffEase: { pct: 20, min: 0, max: 200 },
+    cuffDrape: { pct: 5, min: 0, max: 10 },
+    cuffEase: { pct: 20, min: 0, max: 30 },
     cuffLength: { pct: 10, min: 3, max: 15 },
     frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 },
     hemCurve: { pct: 75, min: 25, max: 100 },

packages/simon/index.html

@@ -114,7 +114,7 @@ let settings1 = { ...settings };
       pattern1.settings.options.cuffStyle = "straightBarrelCuff";
       pattern1.settings.options.splitYoke = "yes";
       pattern1.settings.sa = 10;
-      pattern1.settings.only = "yoke";
+      pattern1.settings.only = ["sleeve", "cuff"];
       pattern1.draft();
       console.log(pattern1);
       document.getElementById("svg1").innerHTML = pattern1.render();

packages/simon/src/shared.js

@@ -45,7 +45,7 @@ export const draftBarrelCuff = part => {
   let height = measurements.shoulderToWrist * options.cuffLength;
   let width =
     measurements.wristCircumference *
-    (1 + options.cuffEase + options.cuffOverlap + options.cuffDrape);
+    (1 + options.cuffEase + options.cuffOverlap);
   store.set("cuffHeight", height);
   points.topLeft = new Point(0, 0);
   points.topRight = new Point(width, 0);

packages/simon/src/sleeve.js

@@ -1,6 +1,7 @@
 import { calculateReduction } from "./shared";
 
 export default part => {
+  part.paths = {}; // This removed paperless dimensions from brian block
   let {
     store,
     measurements,
@@ -18,12 +19,10 @@ export default part => {
     options
   } = part.shorthand();
 
-  // TODO: Sleeve pleats
-
   // Sleeve width depends on cuff style
   let width =
     measurements.wristCircumference *
-    (1 + options.cuffEase + options.cuffOverlap + options.cuffDrape);
+    (1 + options.cuffEase + options.cuffOverlap);
   if (
     options.cuffStyle === "straightFrenchcuff" ||
     options.cuffStyle === "roundedFrenchcuff" ||
@@ -54,6 +53,52 @@ export default part => {
   points.cuffRightCuspCp1 = points.cuffRightCusp.shift(180, width / 10);
   points.cuffRightCuspCp2 = points.cuffRightCusp.shift(0, width / 10);
 
+  // Cuff pleats
+  let drape = options.cuffDrape * measurements.shoulderToWrist;
+  let pleats = 0;
+  let pleatLength = measurements.shoulderToWrist * 0.15;
+  if (drape > 0) {
+    pl;
+    let shiftRight = [
+      "cuffRightCuspCp1",
+      "cuffRightCusp",
+      "cuffRightCuspCp2",
+      "wristRight",
+      "cuffRightMid"
+    ];
+    let shiftLeft = [
+      "cuffLeftCuspCp1",
+      "cuffLeftCusp",
+      "cuffLeftCuspCp2",
+      "wristLeft"
+    ];
+    if (drape > 20) pleats = 2;
+    else pleats = 1;
+    for (let id of shiftRight)
+      points[id] = points[id].shift(0, drape / (2 * pleats));
+    for (let id of shiftLeft)
+      points[id] = points[id].shift(180, drape / (2 * pleats));
+    points.cuffPleat1Fold = points.cuffMid.shift(0, drape / (2 * pleats));
+    points.cuffPleat1Edge = points.cuffMid.shift(0, drape / pleats);
+    points.cuffMidTop = points.cuffMid.shift(90, pleatLength);
+    points.cuffPleat1FoldTop = points.cuffPleat1Fold.shift(90, pleatLength);
+    points.cuffPleat1EdgeTop = points.cuffPleat1Edge.shift(90, pleatLength);
+    if (pleats === 2) {
+      let moreRight = ["cuffRightCuspCp2", "wristRight"];
+      let shift = shiftRight.concat(shiftLeft);
+      for (let id of shift) {
+        if (moreRight.indexOf(id) === -1)
+          points[id] = points[id].shift(180, drape / 4);
+        else points[id] = points[id].shift(0, drape / 4);
+      }
+      points.cuffPleat2Fold = points.cuffRightCusp.shift(0, drape / 4);
+      points.cuffPleat2Edge = points.cuffRightCusp.shift(0, drape / 2);
+      points.cuffPleat2FoldTop = points.cuffPleat2Fold.shift(90, pleatLength);
+      points.cuffPleat2EdgeTop = points.cuffPleat2Edge.shift(90, pleatLength);
+      points.cuffPleat2Top = points.cuffRightCusp.shift(90, pleatLength);
+    }
+  }
+
   paths.frenchBase = new Path()
     .move(points.wristRight)
     .line(points.bicepsRight)
@@ -69,13 +114,15 @@ export default part => {
 
   paths.cuffBase = new Path()
     .move(points.wristLeft)
-    ._curve(points.cuffLeftCuspCp1, points.cuffLeftCusp)
-    .curve(
-      points.cuffLeftCuspCp2,
-      points.cuffRightCuspCp1,
-      points.cuffRightCusp
-    )
-    .curve_(points.cuffRightCuspCp2, points.wristRight);
+    ._curve(points.cuffLeftCuspCp1, points.cuffLeftCusp);
+  if (pleats > 0) {
+    paths.cuffBase
+      .curve_(points.cuffLeftCuspCp2, points.cuffMid)
+      .line(points.cuffPleat1Edge);
+  }
+  paths.cuffBase._curve(points.cuffRightCuspCp1, points.cuffRightCusp);
+  if (pleats === 2) paths.cuffBase.line(points.cuffPleat2Edge);
+  paths.cuffBase.curve_(points.cuffRightCuspCp2, points.wristRight);
   paths.cuffBase.render = false;
 
   paths.seam = paths.frenchBase
@@ -86,6 +133,33 @@ export default part => {
 
   // Complete pattern?
   if (complete) {
+    points.placketEnd = points.cuffLeftCusp.shift(
+      90,
+      options.sleevePlacketLength * measurements.shoulderToWrist
+    );
+    paths.placketCut = new Path()
+      .move(points.cuffLeftCusp)
+      .line(points.placketEnd)
+      .attr("class", "fabric");
+    if (pleats > 0) {
+      paths.pleats = new Path()
+        .move(points.cuffMid)
+        .line(points.cuffMidTop)
+        .move(points.cuffPleat1Fold)
+        .line(points.cuffPleat1FoldTop)
+        .move(points.cuffPleat1Edge)
+        .line(points.cuffPleat1EdgeTop);
+      if (pleats === 2) {
+        paths.pleats
+          .move(points.cuffRightCusp)
+          .line(points.cuffPleat2Top)
+          .move(points.cuffPleat2Fold)
+          .line(points.cuffPleat2FoldTop)
+          .move(points.cuffPleat2Edge)
+          .line(points.cuffPleat2EdgeTop);
+      }
+      paths.pleats.attr("class", "dotted");
+    }
     macro("title", { at: points.centerBiceps, nr: 5, title: "sleeve" });
     macro("grainline", { from: points.cuffMid, to: points.sleeveTip });
 
@@ -101,6 +175,86 @@ export default part => {
 
   // Paperless?
   if (paperless) {
+    macro("hd", {
+      from: points.backNotch,
+      to: points.sleeveTip,
+      y: points.sleeveTip.y - 15 - sa * 2
+    });
+    macro("hd", {
+      from: points.sleeveTip,
+      to: points.frontNotch,
+      y: points.sleeveTip.y - 15 - sa * 2
+    });
+    macro("hd", {
+      from: points.bicepsLeft,
+      to: points.sleeveTip,
+      y: points.sleeveTip.y - 30 - sa * 2
+    });
+    macro("hd", {
+      from: points.sleeveTip,
+      to: points.bicepsRight,
+      y: points.sleeveTip.y - 30 - sa * 2
+    });
+    macro("hd", {
+      from: points.bicepsLeft,
+      to: points.bicepsRight,
+      y: points.sleeveTip.y - 45 - sa * 2
+    });
+    macro("pd", {
+      path: new Path()
+        .move(points.bicepsRight)
+        ._curve(points.capQ1Cp1, points.capQ1)
+        .curve(points.capQ1Cp2, points.capQ2Cp1, points.capQ2)
+        .curve(points.capQ2Cp2, points.capQ3Cp1, points.capQ3)
+        .curve(points.capQ3Cp2, points.capQ4Cp1, points.capQ4)
+        .curve_(points.capQ4Cp2, points.bicepsLeft)
+        .reverse(),
+      d: 15
+    });
+    macro("vd", {
+      from: points.wristRight,
+      to: points.bicepsRight,
+      x: points.bicepsRight.x + 15 + sa * 2
+    });
+    macro("vd", {
+      from: points.bicepsRight,
+      to: points.frontNotch,
+      x: points.bicepsRight.x + 15 + sa * 2
+    });
+    macro("vd", {
+      from: points.bicepsRight,
+      to: points.sleeveTip,
+      x: points.bicepsRight.x + 30 + sa * 2
+    });
+    macro("vd", {
+      from: points.bicepsLeft,
+      to: points.backNotch,
+      x: points.bicepsLeft.x - 15 - sa
+    });
+    macro("vd", {
+      from: points.cuffLeftCusp,
+      to: points.placketEnd,
+      x: points.placketEnd.x - 15
+    });
+    macro("hd", {
+      from: points.wristLeft,
+      to: points.wristRight,
+      y: points.wristLeft.y + 15 + sa
+    });
+    if (pleats > 0) {
+      macro("hd", {
+        from: points.cuffMidTop,
+        to: points.cuffPleat1EdgeTop,
+        y: points.cuffMidTop.y - 15
+      });
+      if (pleats === 2) {
+        macro("hd", {
+          from: points.cuffPleat2Top,
+          to: points.cuffPleat2EdgeTop,
+          y: points.cuffPleat2Top.y - 15
+        });
+      }
+    }
   }
 
   return part;