Merge pull request #5010 from freesewing/joost

chore(trayvon): Prepare for v3 beta

config/software/designs.json

@@ -382,7 +382,7 @@
     "design": "Joost De Cock",
     "difficulty": 2,
     "tags": ["accessories"],
-    "techniques": []
+    "techniques": ["precision", "lining"]
   },
   "tutorial": {
     "description": "A FreeSewing pattern for a baby bib that's used in our tutorial",

designs/trayvon/i18n/en.json

@@ -10,7 +10,10 @@
     "liningTail": "Lining tail",
     "liningTip": "Lining tip"
   },
-  "s": {},
+  "s": {
+    "cutLoop.t": "The loop is not shown",
+    "cutLoop.d": "The **Loop** is a rectangular piece of fabric {{{ width }}} wide and {{{ length }}} long (this part does not use seam allowance). It is not shown because the **expand** core setting is currently disabled. Enable it to show this pattern part."
+  },
   "o": {
     "tipWidth": {
       "t": "Tip width",

designs/trayvon/src/fabric.mjs

@@ -7,106 +7,98 @@ import {
 } from './shared.mjs'
 
 function trayvonFabricTail(params) {
-  const { Path, complete, macro, paths, points, paperless, sa, store, absoluteOptions } = params
+  const { Path, complete, macro, paths, points, sa, store, absoluteOptions } = params
 
   calculateHelpers(params)
   draftTieShape(params, store.get('backTip') * 2.5, absoluteOptions.knotWidth * 2.5, true)
-  paths.seam.attributes.add('class', 'fabric')
+  paths.seam.addClass('fabric')
+  if (sa) seamAllowance(params, 'fabric')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1 })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 4,
-      nr: 4,
+    title: 'fabricTail',
-      title: 'fabricTail',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
 
-    if (sa) seamAllowance(params, 'fabric')
+  // Dimensions
-  }
+  tieShapeDimensions(params)
-
+  macro('ld', {
-  // Paperless?
+    id: 'lTipToNotch1',
-  if (paperless) {
+    from: points.tip,
-    tieShapeDimensions(params)
+    to: points.notch1,
-    macro('ld', {
+    d: absoluteOptions.tipWidth / -2.5,
-      from: points.tip,
+  })
-      to: points.notch1,
+  macro('ld', {
-      d: absoluteOptions.tipWidth / -2.5,
+    id: 'lTipToNotch2',
-    })
+    from: points.notch2,
-    macro('ld', {
+    to: points.tip,
-      from: points.notch2,
+    d: absoluteOptions.tipWidth / -2.5,
-      to: points.tip,
+  })
-      d: absoluteOptions.tipWidth / -2.5,
+  if (complete)
-    })
     paths.n45 = new Path()
       .move(points.midLeft)
       .line(points.midRight)
-      .attr('class', 'hidden')
+      .addClass('hidden')
-      .attr('data-text', '45°')
+      .addText('45°', 'center')
-      .attr('data-text-class', 'center')
-  }
 
   return params.part
 }
 
 function trayvonFabricTip(params) {
-  const {
+  const { Path, Snippet, complete, macro, paths, points, sa, snippets, absoluteOptions, store } =
-    Path,
+    params
-    Snippet,
-    complete,
-    macro,
-    paths,
-    paperless,
-    points,
-    sa,
-    snippets,
-    absoluteOptions,
-    store,
-  } = params
 
   calculateHelpers(params)
   draftTieShape(params, absoluteOptions.tipWidth * 2.5, absoluteOptions.knotWidth * 2.5, true)
-  paths.seam.attributes.add('class', 'fabric')
+  paths.seam.addClass('fabric')
+  if (sa) seamAllowance(params, 'fabric')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1 })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 3,
-      nr: 3,
+    title: 'fabricTip',
-      title: 'fabricTip',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
 
-    points.logo = points.tip.shiftFractionTowards(points.mid, 0.4)
+  // Logo
-    snippets.logo = new Snippet('logo', points.logo)
+  points.logo = points.tip.shiftFractionTowards(points.mid, 0.4)
+  snippets.logo = new Snippet('logo', points.logo)
 
-    if (sa) seamAllowance(params, 'fabric')
+  // Dimensions
-  }
+  tieShapeDimensions(params)
-
+  macro('ld', {
-  // Paperless?
+    id: 'lTipToNotch1',
-  if (paperless) {
+    from: points.tip,
-    tieShapeDimensions(params)
+    to: points.notch1,
-    macro('ld', {
+    d: absoluteOptions.tipWidth / -2.5,
-      from: points.tip,
+  })
-      to: points.notch1,
+  macro('ld', {
-      d: absoluteOptions.tipWidth / -2.5,
+    id: 'lTipToNotch2',
-    })
+    from: points.notch2,
-    macro('ld', {
+    to: points.tip,
-      from: points.notch2,
+    d: absoluteOptions.tipWidth / -2.5,
-      to: points.tip,
+  })
-      d: absoluteOptions.tipWidth / -2.5,
+  if (complete)
-    })
     paths.n45 = new Path()
       .move(points.midLeft)
       .line(points.midRight)
-      .attr('class', 'hidden')
+      .addClass('hidden')
-      .attr('data-text', '45°')
+      .addText('45°', 'center')
-      .attr('data-text-class', 'center')
-  }
 
   return params.part
 }

designs/trayvon/src/interfacing.mjs

@@ -1,67 +1,67 @@
 import { draftTieShape, tieShapeDimensions, calculateHelpers, options } from './shared.mjs'
 
 function trayvonInterfacingTail(params) {
-  const { paths, points, macro, complete, paperless, Path, store, absoluteOptions } = params
+  const { paths, points, macro, complete, Path, store, absoluteOptions } = params
 
   calculateHelpers(params)
   draftTieShape(params, store.get('backTip'), absoluteOptions.knotWidth)
-  paths.seam.attributes.add('class', 'interfacing')
+  paths.seam.addClass('interfacing')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1, material: 'interfacing' })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 2,
-      nr: 2,
+    title: 'interfacingTail',
-      title: 'interfacingTail',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
-  }
 
-  // Paperless?
+  // Dimensions
-  if (paperless) {
+  tieShapeDimensions(params)
-    tieShapeDimensions(params)
+  if (complete)
     paths.n45 = new Path()
       .move(points.midLeft)
       .line(points.midRight)
-      .attr('class', 'hidden')
+      .addClass('hidden')
-      .attr('data-text', '45°')
+      .addText('45°', 'center text-sm fill-note')
-      .attr('data-text-class', 'center')
-  }
 
   return params.part
 }
 
 function trayvonInterfacingTip(params) {
-  const { paths, points, macro, complete, paperless, Path, absoluteOptions, store } = params
+  const { paths, points, macro, complete, Path, absoluteOptions, store } = params
 
   calculateHelpers(params)
   draftTieShape(params, absoluteOptions.tipWidth, absoluteOptions.knotWidth)
-  paths.seam.attributes.add('class', 'interfacing')
+  paths.seam.addClass('interfacing')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1, material: 'interfacing' })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 1,
-      nr: 1,
+    title: 'interfacingTip',
-      title: 'interfacingTip',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
-  }
 
-  // Paperless?
+  // Dimentions
-  if (paperless) {
+  tieShapeDimensions(params)
-    tieShapeDimensions(params)
+  if (complete)
     paths.n45 = new Path()
       .move(points.midLeft)
       .line(points.midRight)
-      .attr('class', 'hidden')
+      .addClass('hidden')
-      .attr('data-text', '45°')
+      .addText('45°', 'center text-sm fill-note')
-      .attr('data-text-class', 'center')
-  }
 
   return params.part
 }

designs/trayvon/src/lining.mjs

@@ -7,20 +7,8 @@ import {
 } from './shared.mjs'
 
 function trayvonLiningTail(params) {
-  const {
+  const { Path, Snippet, macro, options, paths, points, sa, snippets, store, absoluteOptions } =
-    Path,
+    params
-    Snippet,
-    complete,
-    macro,
-    options,
-    paths,
-    points,
-    paperless,
-    sa,
-    snippets,
-    store,
-    absoluteOptions,
-  } = params
 
   calculateHelpers(params)
   draftTieShape(params, store.get('backTip') * 2.5, options.knotWidth * 2.5)
@@ -38,43 +26,34 @@ function trayvonLiningTail(params) {
     .line(points.tipRight)
     .line(points.tip)
     .close()
-    .attr('class', 'lining')
+    .addClass('lining')
+  if (sa) seamAllowance(params, 'lining')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1, material: 'lining' })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 6,
-      nr: 6,
+    title: 'liningTip',
-      title: 'liningTip',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
-    snippets.notch = new Snippet('notch', points.tip)
 
-    if (sa) seamAllowance(params, 'lining')
+  // Notch
-  }
+  snippets.notch = new Snippet('notch', points.tip)
 
-  // Paperless?
+  // Dimensions
-  if (paperless) tieShapeDimensions(params, true)
+  tieShapeDimensions(params, true)
 
   return params.part
 }
 
 function trayvonLiningTip(params) {
-  const {
+  const { Path, Snippet, macro, paths, points, sa, snippets, absoluteOptions, store } = params
-    Path,
-    Snippet,
-    complete,
-    macro,
-    paperless,
-    paths,
-    points,
-    sa,
-    snippets,
-    absoluteOptions,
-    store,
-  } = params
 
   calculateHelpers(params)
   draftTieShape(params, absoluteOptions.tipWidth * 2.5, absoluteOptions.knotWidth * 2.5)
@@ -92,28 +71,32 @@ function trayvonLiningTip(params) {
     .line(points.tipRight)
     .line(points.tip)
     .close()
-    .attr('class', 'lining')
+    .addClass('lining')
 
+  if (sa) seamAllowance(params, 'lining')
+
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1, material: 'lining' })
 
-  // Complete pattern?
+  // Title
-  if (complete) {
+  macro('title', {
-    macro('title', {
+    at: points.title,
-      at: points.title,
+    nr: 5,
-      nr: 5,
+    title: 'liningTip',
-      title: 'liningTip',
+    rotation: -90,
-      rotation: -90,
+  })
-    })
-    snippets.notch = new Snippet('notch', points.tip)
-    macro('miniscale', { at: points.gridAnchor })
 
-    if (sa) seamAllowance(params, 'lining')
+  // Notch
-  }
+  snippets.notch = new Snippet('notch', points.tip)
 
-  // Paperless?
+  // Miniscale
-  if (paperless) {
+  macro('miniscale', { at: points.gridAnchor })
-    tieShapeDimensions(params, true)
+
-  }
+  // Dimensions
+  tieShapeDimensions(params, true)
 
   return params.part
 }

designs/trayvon/src/loop.mjs

@@ -1,14 +1,32 @@
-function trayvonFabricLoop({
+import { interfacingTip } from './interfacing.mjs'
-  points,
+
-  Point,
+function trayvonFabricLoop({ points, Point, paths, Path, store, macro, expand, units, part }) {
-  paths,
+  const w = store.get('backTip') * 3.5
-  Path,
+  const h = store.get('backTip')
-  complete,
+
-  paperless,
+  if (expand) store.flag.preset('expandIsOn')
-  store,
+  else {
-  macro,
+    // Expand is on, do not draw the part but flag this to the user
-  part,
+    store.flag.note({
-}) {
+      msg: `trayvon:cutLoop`,
+      replace: {
+        width: units(w),
+        length: units(h),
+      },
+      suggest: {
+        text: 'flag:show',
+        icon: 'expand',
+        update: {
+          settings: ['expand', 1],
+        },
+      },
+    })
+    // Also hint about expand
+    store.flag.preset('expandIsOff')
+
+    return part.hide()
+  }
+
   points.topLeft = new Point(0, 0)
   points.bottomRight = new Point(store.get('backTip') * 3.5, store.get('backTip'))
   points.topRight = new Point(points.bottomRight.x, points.topLeft.y)
@@ -23,36 +41,42 @@ function trayvonFabricLoop({
     .close()
     .attr('class', 'fabric')
 
+  /*
+   * Annotations
+   */
+  // Cutlist
   store.cutlist.addCut({ cut: 1, material: 'lining' })
 
-  if (complete) {
+  // Title
-    points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5)
+  points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5)
+  macro('title', {
+    nr: 7,
+    title: 'loop',
+    at: points.title,
+    align: 'center',
+    scale: 0.666,
+  })
 
-    macro('title', {
+  // Dimensions
-      nr: 7,
+  macro('hd', {
-      title: 'loop',
+    id: 'wFull',
-      at: points.title,
+    from: points.bottomLeft,
-    })
+    to: points.bottomRight,
-  }
+    y: points.bottomRight.y + 15,
-
+  })
-  if (paperless) {
+  macro('vd', {
-    macro('hd', {
+    id: 'hFull',
-      from: points.bottomLeft,
+    from: points.topRight,
-      to: points.bottomRight,
+    to: points.bottomRight,
-      y: points.bottomRight.y + 15,
+    x: points.topRight.x + 15,
-    })
+  })
-    macro('vd', {
-      from: points.topRight,
-      to: points.bottomRight,
-      x: points.topRight.x + 15,
-    })
-  }
 
   return part
 }
 
 export const fabricLoop = {
   name: 'trayvon.fabricLoop',
+  after: interfacingTip,
   measurements: ['hpsToWaistBack', 'waistToHips', 'neck'],
   draft: trayvonFabricLoop,
 }

designs/trayvon/src/shared.mjs

@@ -12,7 +12,7 @@ export const options = {
   },
 }
 export const calculateHelpers = ({ store, measurements, options, absoluteOptions }) => {
-  let halfLength =
+  const halfLength =
     (measurements.hpsToWaistBack + measurements.waistToHips + measurements.neck / 2) *
     (1 + options.lengthBonus)
   let backTip = absoluteOptions.tipWidth * 0.7
@@ -28,9 +28,9 @@ export const draftTieShape = (
   knotWidth,
   notch = false
 ) => {
-  let hl = store.get('halfLength')
+  const hl = store.get('halfLength')
-  let ht = tipWidth / 2
+  const ht = tipWidth / 2
-  let hk = knotWidth / 2
+  const hk = knotWidth / 2
 
   points.tip = new Point(0, 0)
   points.mid = new Point(0, hl)
@@ -63,39 +63,45 @@ export const draftTieShape = (
     .close()
 }
 
-export const tieShapeDimensions = ({ points, macro, paths, Path }, lining = false) => {
+export const tieShapeDimensions = ({ points, macro, paths, Path, complete }, lining = false) => {
   macro('hd', {
+    id: 'wFull',
     from: points.tipLeft,
     to: points.tipRight,
     y: points.tip.y - 15,
   })
   macro('vd', {
+    id: 'hTip',
     from: points.tipRight,
     to: points.tip,
     x: points.tipRight.x + 15,
   })
   if (lining) {
     macro('vd', {
+      id: 'hFull',
       from: points.cutRight,
       to: points.tip,
       x: points.cutRight.x + 30,
     })
   } else {
     macro('hd', {
+      id: 'wAtTip',
       from: points._tmp3,
       to: points._tmp1,
       y: points.midLeft.y + 15,
     })
     macro('vd', {
+      id: 'hLength',
       from: points.mid,
       to: points.tip,
       x: points.tipRight.x + 30,
     })
-    paths.hint = new Path()
+    if (complete)
-      .move(points._tmp3)
+      paths.hint = new Path()
-      .line(points._tmp1)
+        .move(points._tmp3)
-      .line(points.midRight)
+        .line(points._tmp1)
-      .attr('class', 'dotted')
+        .line(points.midRight)
+        .attr('class', 'dotted')
   }
 }