fix(paco): Paperless without detail. Fixes #1400

2021-11-08 19:36:47 +01:00 · 2021-11-08 19:36:47 +01:00 · 0c999a7f0b
commit 0c999a7f0b
parent 76244a6860
8 changed files with 285 additions and 281 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,7 @@

 #### Fixed

+ - Make paperless markings available when detail is disabled Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
 - Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)

 ### simon
--- a/config/changelog.yaml
+++ b/config/changelog.yaml
@ -3,6 +3,8 @@ unreleased:

  Fixed:
    paco:
+      - Make paperless markings available when detail is disabled
+        Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
      - Make pocket flaps properly parametric
        Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)
    simon:
--- a/packages/paco/CHANGELOG.md
+++ b/packages/paco/CHANGELOG.md
@ -5,6 +5,7 @@

 ### Fixed

+ - Make paperless markings available when detail is disabled Closes [#1400](https://github.com/freesewing/freesewing/issues/1401)
 - Make pocket flaps properly parametric Closes [#1401](https://github.com/freesewing/freesewing/issues/1401)

 ## 2.19.0 (2021-10-17)
--- a/packages/paco/src/back.js
+++ b/packages/paco/src/back.js
@ -178,128 +178,128 @@ export default function (part) {
        .close()
        .attr('class', 'fabric sa')
    }
+  }

-    if (paperless) {
-      // Help construct cross seam
-      paths.hint = new Path()
-        .move(points.crossSeamCurveStart)
-        .line(points.crossSeamCurveMax)
-        .line(points.fork)
-        .attr('class', 'note lashed')
-      macro('hd', {
-        from: points.floorIn,
-        to: points.floorOut,
-        y: points.floorIn.y - 30,
-      })
-      macro('hd', {
-        from: points.floorIn,
-        to: points.floor,
-        y: points.floorIn.y - 15,
-      })
-      macro('hd', {
-        from: points.floor,
-        to: points.floorOut,
-        y: points.floorIn.y - 15,
-      })
-      macro('vd', {
-        from: points.floorOut,
-        to: points.styleWaistOut,
-        x:
-          (points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) +
-          sa +
-          15,
-      })
-      macro('vd', {
-        from: points.floorIn,
-        to: points.fork,
-        x: points.fork.x - sa - 15,
-      })
-      macro('vd', {
-        from: points.fork,
-        to: points.styleWaistIn,
-        x: points.fork.x - sa - 15,
-      })
-      macro('vd', {
-        from: points.floorIn,
-        to: points.styleWaistIn,
-        x: points.fork.x - sa - 30,
-      })
-      macro('vd', {
-        from: points.crossSeamCurveStart,
-        to: points.styleWaistIn,
-        x: points.crossSeamCurveStart.x - sa - 15,
-      })
-      macro('hd', {
-        from: points.styleWaistIn,
-        to: points.grainlineTop,
-        y: points.styleWaistIn.y - sa - 15,
-      })
-      macro('hd', {
-        from: points.crossSeamCurveStart,
-        to: points.grainlineTop,
-        y: points.styleWaistIn.y - sa - 30,
-      })
-      macro('hd', {
-        from: points.crossSeamCurveMax,
-        to: points.grainlineTop,
-        y: points.styleWaistIn.y - sa - 45,
-      })
-      macro('hd', {
-        from: points.fork,
-        to: points.grainlineTop,
-        y: points.styleWaistIn.y - sa - 60,
-      })
+  if (paperless) {
+    // Help construct cross seam
+    paths.hint = new Path()
+      .move(points.crossSeamCurveStart)
+      .line(points.crossSeamCurveMax)
+      .line(points.fork)
+      .attr('class', 'note lashed')
+    macro('hd', {
+      from: points.floorIn,
+      to: points.floorOut,
+      y: points.floorIn.y - 30,
+    })
+    macro('hd', {
+      from: points.floorIn,
+      to: points.floor,
+      y: points.floorIn.y - 15,
+    })
+    macro('hd', {
+      from: points.floor,
+      to: points.floorOut,
+      y: points.floorIn.y - 15,
+    })
+    macro('vd', {
+      from: points.floorOut,
+      to: points.styleWaistOut,
+      x:
+        (points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) +
+        sa +
+        15,
+    })
+    macro('vd', {
+      from: points.floorIn,
+      to: points.fork,
+      x: points.fork.x - sa - 15,
+    })
+    macro('vd', {
+      from: points.fork,
+      to: points.styleWaistIn,
+      x: points.fork.x - sa - 15,
+    })
+    macro('vd', {
+      from: points.floorIn,
+      to: points.styleWaistIn,
+      x: points.fork.x - sa - 30,
+    })
+    macro('vd', {
+      from: points.crossSeamCurveStart,
+      to: points.styleWaistIn,
+      x: points.crossSeamCurveStart.x - sa - 15,
+    })
+    macro('hd', {
+      from: points.styleWaistIn,
+      to: points.grainlineTop,
+      y: points.styleWaistIn.y - sa - 15,
+    })
+    macro('hd', {
+      from: points.crossSeamCurveStart,
+      to: points.grainlineTop,
+      y: points.styleWaistIn.y - sa - 30,
+    })
+    macro('hd', {
+      from: points.crossSeamCurveMax,
+      to: points.grainlineTop,
+      y: points.styleWaistIn.y - sa - 45,
+    })
+    macro('hd', {
+      from: points.fork,
+      to: points.grainlineTop,
+      y: points.styleWaistIn.y - sa - 60,
+    })
+    macro('hd', {
+      from: points.grainlineTop,
+      to: points.styleWaistOut,
+      y: points.styleWaistIn.y - sa - 15,
+    })
+    if (points.seatOut.x > points.styleWaistOut.x) {
      macro('hd', {
        from: points.grainlineTop,
-        to: points.styleWaistOut,
-        y: points.styleWaistIn.y - sa - 15,
+        to: points.seatOut,
+        y: points.styleWaistIn.y - sa - 30,
+      })
+    }
+    if (options.frontPockets) {
+      macro('ld', {
+        from: points.styleWaistOut,
+        to: points.pocketFlapTopIn,
+        d: -15,
+      })
+      macro('ld', {
+        from: points.pocketFlapTopIn,
+        to: points.pocketFlapBottomIn,
+        d: -15,
+      })
+      macro('ld', {
+        from: points.pocketFlapTopIn,
+        to: points.pocketFlapTopOut,
+        d: -15,
+      })
+    }
+    if (options.backPockets) {
+      macro('ld', {
+        from: points.styleWaistIn,
+        to: points.pocketBagWaistLeft,
+        d: -15 - sa,
+      })
+      macro('ld', {
+        from: points.styleWaistIn,
+        to: points.pocketWaistCenter,
+        d: -30 - sa,
+      })
+      macro('ld', {
+        from: points.pocketCenter,
+        to: points.pocketWaistCenter,
+        d: -15,
+      })
+      macro('ld', {
+        from: points.pocketBagBottomRight,
+        to: points.pocketBagWaistRight,
+        d: -15,
      })
-      if (points.seatOut.x > points.styleWaistOut.x) {
-        macro('hd', {
-          from: points.grainlineTop,
-          to: points.seatOut,
-          y: points.styleWaistIn.y - sa - 30,
-        })
-      }
-      if (options.frontPockets) {
-        macro('ld', {
-          from: points.styleWaistOut,
-          to: points.pocketFlapTopIn,
-          d: -15,
-        })
-        macro('ld', {
-          from: points.pocketFlapTopIn,
-          to: points.pocketFlapBottomIn,
-          d: -15,
-        })
-        macro('ld', {
-          from: points.pocketFlapTopIn,
-          to: points.pocketFlapTopOut,
-          d: -15,
-        })
-      }
-      if (options.backPockets) {
-        macro('ld', {
-          from: points.styleWaistIn,
-          to: points.pocketBagWaistLeft,
-          d: -15 - sa,
-        })
-        macro('ld', {
-          from: points.styleWaistIn,
-          to: points.pocketWaistCenter,
-          d: -30 - sa,
-        })
-        macro('ld', {
-          from: points.pocketCenter,
-          to: points.pocketWaistCenter,
-          d: -15,
-        })
-        macro('ld', {
-          from: points.pocketBagBottomRight,
-          to: points.pocketBagWaistRight,
-          d: -15,
-        })
-      }
    }
  }

--- a/packages/paco/src/cuff.js
+++ b/packages/paco/src/cuff.js
@ -53,19 +53,19 @@ export default function (part) {
        .line(points.bottomRight.shift(-90, sa).shift(0, sa))
        .attr('class', 'help')
    }
+  }

-    if (paperless) {
-      macro('vd', {
-        from: points.bottomRight,
-        to: points.topRight,
-        x: points.topRight.x + 15 + sa,
-      })
-      macro('hd', {
-        from: points.bottomLeft,
-        to: points.bottomRight,
-        y: points.bottomRight.y + 15 + sa,
-      })
-    }
+  if (paperless) {
+    macro('vd', {
+      from: points.bottomRight,
+      to: points.topRight,
+      x: points.topRight.x + 15 + sa,
+    })
+    macro('hd', {
+      from: points.bottomLeft,
+      to: points.bottomRight,
+      y: points.bottomRight.y + 15 + sa,
+    })
  }

  return part
--- a/packages/paco/src/front.js
+++ b/packages/paco/src/front.js
@ -210,111 +210,111 @@ export default function (part) {
        .close()
        .attr('class', 'fabric sa')
    }
+  }

-    if (paperless) {
-      // Help construct crotch seam
-      paths.hint = new Path()
-        .move(points.crotchSeamCurveStart)
-        .line(points.crotchSeamCurveMax)
-        .line(points.fork)
-        .attr('class', 'note lashed')
-      macro('hd', {
-        from: points.floorOut,
-        to: points.floor,
-        y: points.floorIn.y - 15,
-      })
-      macro('hd', {
-        from: points.floor,
-        to: points.floorIn,
-        y: points.floorIn.y - 15,
-      })
-      macro('hd', {
-        from: points.floorOut,
-        to: points.floorIn,
-        y: points.floorIn.y - 30,
-      })
-      macro('vd', {
-        from: points.floorOut,
-        to: points.fork,
-        x: points.fork.x + sa + 15,
-      })
-      macro('vd', {
-        from: points.fork,
-        to: points.styleWaistIn,
-        x: points.fork.x + sa + 15,
-      })
-      macro('vd', {
-        from: points.floorIn,
-        to: points.styleWaistOut,
-        x:
-          (points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) -
-          sa -
-          15,
-      })
-      macro('vd', {
-        from: points.crotchSeamCurveStart,
-        to: points.styleWaistIn,
-        x: points.crotchSeamCurveStart.x + sa + 15,
-      })
+  if (paperless) {
+    // Help construct crotch seam
+    paths.hint = new Path()
+      .move(points.crotchSeamCurveStart)
+      .line(points.crotchSeamCurveMax)
+      .line(points.fork)
+      .attr('class', 'note lashed')
+    macro('hd', {
+      from: points.floorOut,
+      to: points.floor,
+      y: points.floorIn.y - 15,
+    })
+    macro('hd', {
+      from: points.floor,
+      to: points.floorIn,
+      y: points.floorIn.y - 15,
+    })
+    macro('hd', {
+      from: points.floorOut,
+      to: points.floorIn,
+      y: points.floorIn.y - 30,
+    })
+    macro('vd', {
+      from: points.floorOut,
+      to: points.fork,
+      x: points.fork.x + sa + 15,
+    })
+    macro('vd', {
+      from: points.fork,
+      to: points.styleWaistIn,
+      x: points.fork.x + sa + 15,
+    })
+    macro('vd', {
+      from: points.floorIn,
+      to: points.styleWaistOut,
+      x:
+        (points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) -
+        sa -
+        15,
+    })
+    macro('vd', {
+      from: points.crotchSeamCurveStart,
+      to: points.styleWaistIn,
+      x: points.crotchSeamCurveStart.x + sa + 15,
+    })
+    macro('hd', {
+      from: points.styleWaistOut,
+      to: points.grainlineTop,
+      y: points.styleWaistIn.y - sa - 15,
+    })
+    if (points.styleWaistOut.x < points.seatOut.x) {
      macro('hd', {
        from: points.styleWaistOut,
        to: points.grainlineTop,
-        y: points.styleWaistIn.y - sa - 15,
-      })
-      if (points.styleWaistOut.x < points.seatOut.x) {
-        macro('hd', {
-          from: points.styleWaistOut,
-          to: points.grainlineTop,
-          y: points.styleWaistIn.y - sa - 30,
-        })
-      }
-      macro('hd', {
-        from: points.grainlineTop,
-        to: points.styleWaistIn,
-        y: points.styleWaistIn.y - sa - 15,
-      })
-      macro('hd', {
-        from: points.grainlineTop,
-        to: points.crotchSeamCurveStart,
        y: points.styleWaistIn.y - sa - 30,
      })
-      macro('hd', {
-        from: points.grainlineTop,
-        to: points.crotchSeamCurveMax,
-        y: points.styleWaistIn.y - sa - 45,
+    }
+    macro('hd', {
+      from: points.grainlineTop,
+      to: points.styleWaistIn,
+      y: points.styleWaistIn.y - sa - 15,
+    })
+    macro('hd', {
+      from: points.grainlineTop,
+      to: points.crotchSeamCurveStart,
+      y: points.styleWaistIn.y - sa - 30,
+    })
+    macro('hd', {
+      from: points.grainlineTop,
+      to: points.crotchSeamCurveMax,
+      y: points.styleWaistIn.y - sa - 45,
+    })
+    macro('hd', {
+      from: points.grainlineTop,
+      to: points.fork,
+      y: points.styleWaistIn.y - sa - 60,
+    })
+    if (options.frontPockets) {
+      macro('ld', {
+        from: points.pocketFlapTopIn,
+        to: points.styleWaistOut,
+        d: -15,
      })
-      macro('hd', {
-        from: points.grainlineTop,
-        to: points.fork,
-        y: points.styleWaistIn.y - sa - 60,
+      macro('ld', {
+        from: points.pocketFlapTopIn,
+        to: points.pocketFlapBottomIn,
+        d: -15,
+      })
+      macro('ld', {
+        from: points.pocketFlapTopOut,
+        to: points.pocketFlapTopIn,
+        d: 15,
+      })
+      macro('ld', {
+        from: points.styleWaistOut || points.waistOut,
+        to: points.topLeft,
+        d: 10 + sa,
+      })
+      macro('ld', {
+        from: points.topLeft,
+        to: points.topRight,
+        d: 10 + sa,
      })
-      if (options.frontPockets) {
-        macro('ld', {
-          from: points.pocketFlapTopIn,
-          to: points.styleWaistOut,
-          d: -15,
-        })
-        macro('ld', {
-          from: points.pocketFlapTopIn,
-          to: points.pocketFlapBottomIn,
-          d: -15,
-        })
-        macro('ld', {
-          from: points.pocketFlapTopOut,
-          to: points.pocketFlapTopIn,
-          d: 15,
-        })
-        macro('ld', {
-          from: points.styleWaistOut || points.waistOut,
-          to: points.topLeft,
-          d: 10 + sa,
-        })
-        macro('ld', {
-          from: points.topLeft,
-          to: points.topRight,
-          d: 10 + sa,
-        })
-      }
    }
  }

--- a/packages/paco/src/pocketbagback.js
+++ b/packages/paco/src/pocketbagback.js
@ -73,29 +73,29 @@ export default function (part) {
        .line(points.pocketBagBottomLeft)
        .attr('class', 'lining sa')
    }
+  }

-    if (paperless) {
-      macro('hd', {
-        from: points.pocketBagBottomLeft,
-        to: points.pocketBagBottomRight,
-        y: points.pocketBagBottomLeft.y + 15 + sa,
-      })
-      macro('hd', {
-        from: points.pocketLeft,
-        to: points.pocketRight,
-        y: points.pocketLeft.y + 15 + sa,
-      })
-      macro('vd', {
-        from: points.pocketRight,
-        to: points.pocketBagWaistRight,
-        x: points.pocketBagBottomRight.x + 15 + sa,
-      })
-      macro('vd', {
-        from: points.pocketBagBottomRight,
-        to: points.pocketBagWaistRight,
-        x: points.pocketBagBottomRight.x + 30 + sa,
-      })
-    }
+  if (paperless) {
+    macro('hd', {
+      from: points.pocketBagBottomLeft,
+      to: points.pocketBagBottomRight,
+      y: points.pocketBagBottomLeft.y + 15 + sa,
+    })
+    macro('hd', {
+      from: points.pocketLeft,
+      to: points.pocketRight,
+      y: points.pocketLeft.y + 15 + sa,
+    })
+    macro('vd', {
+      from: points.pocketRight,
+      to: points.pocketBagWaistRight,
+      x: points.pocketBagBottomRight.x + 15 + sa,
+    })
+    macro('vd', {
+      from: points.pocketBagBottomRight,
+      to: points.pocketBagWaistRight,
+      x: points.pocketBagBottomRight.x + 30 + sa,
+    })
  }

  return part
--- a/packages/paco/src/pocketbagfront.js
+++ b/packages/paco/src/pocketbagfront.js
@ -59,39 +59,39 @@ export default function (part) {
        .line(points.bottomRight)
        .attr('class', 'lining sa')
    }
+  }

-    if (paperless) {
-      macro('hd', {
-        from: points.flapBottomLeft,
-        to: points.bottomRight,
-        y: points.bottomRight.y + 15 + sa,
-      })
-      macro('hd', {
-        from: points.topLeft,
-        to: points.topRight,
-        y: points.topLeft.y - 15 - sa,
-      })
-      macro('vd', {
-        from: points.bottomRight,
-        to: points.topRight,
-        x: points.topRight.x + 15 + sa,
-      })
-      macro('vd', {
-        from: points.bottomRight,
-        to: points.topLeft,
-        x: points.topRight.x + 30 + sa,
-      })
-      macro('ld', {
-        from: points.flapTopLeft,
-        to: points.topLeft,
-        d: 15 + sa,
-      })
-      macro('ld', {
-        from: points.flapBottomLeft,
-        to: points.flapTopLeft,
-        d: 15 + sa,
-      })
-    }
+  if (paperless) {
+    macro('hd', {
+      from: points.flapBottomLeft,
+      to: points.bottomRight,
+      y: points.bottomRight.y + 15 + sa,
+    })
+    macro('hd', {
+      from: points.topLeft,
+      to: points.topRight,
+      y: points.topLeft.y - 15 - sa,
+    })
+    macro('vd', {
+      from: points.bottomRight,
+      to: points.topRight,
+      x: points.topRight.x + 15 + sa,
+    })
+    macro('vd', {
+      from: points.bottomRight,
+      to: points.topLeft,
+      x: points.topRight.x + 30 + sa,
+    })
+    macro('ld', {
+      from: points.flapTopLeft,
+      to: points.topLeft,
+      d: 15 + sa,
+    })
+    macro('ld', {
+      from: points.flapBottomLeft,
+      to: points.flapTopLeft,
+      d: 15 + sa,
+    })
  }

  return part