From a4983dfdc6791648a6d71fcea9d255075279076f Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 10 Sep 2022 20:28:51 +0200 Subject: [PATCH] chore(bob): Port to v3 stage 2 --- designs/bob/src/bib.mjs | 42 +++++++++++++++++++-------------------- designs/bob/src/box.mjs | 17 ++++++++++++---- designs/bob/src/index.mjs | 3 +-- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/designs/bob/src/bib.mjs b/designs/bob/src/bib.mjs index da40925b3ad..3256a358e1a 100644 --- a/designs/bob/src/bib.mjs +++ b/designs/bob/src/bib.mjs @@ -10,23 +10,22 @@ export const bib = { lengthRatio: { pct: 75, min: 55, max: 85, menu: 'fit' }, headSize: { pct: 100, min: 10, max: 200, snap: 5, menu: 'size' }, }, - plugins: [ pluginBundle ], - draft: part => { - const { - Point, - points, - Path, - paths, - optionalMeasurements, - options, - macro, - raise, - complete, - snippets, - Snippet, - paperless, - } = part.shorthand() - + plugins: [pluginBundle], + draft: ({ + Point, + points, + Path, + paths, + optionalMeasurements, + options, + macro, + log, + complete, + snippets, + Snippet, + paperless, + part, + }) => { // Head size const head = (optionalMeasurements?.head || 360) * options.headSize @@ -176,9 +175,9 @@ export const bib = { .close() .attr('class', 'fabric') - raise.info(['biasTapeLength', { mm: paths.seam.length() }]) - raise.info(['fabricHeight', { mm: points.tipRightTopStart.dy(points.bottomLeftEnd) }]) - raise.info(['fabricWidth', { mm: points.bottomLeftStart.dx(points.bottomRightEnd) }]) + log.info(['biasTapeLength', { mm: paths.seam.length() }]) + log.info(['fabricHeight', { mm: points.tipRightTopStart.dy(points.bottomLeftEnd) }]) + log.info(['fabricWidth', { mm: points.bottomLeftStart.dx(points.bottomRightEnd) }]) // Complete? if (complete) { @@ -246,6 +245,5 @@ export const bib = { } return part - } + }, } - diff --git a/designs/bob/src/box.mjs b/designs/bob/src/box.mjs index 18b3ab1e23b..8ffdfe2b51b 100644 --- a/designs/bob/src/box.mjs +++ b/designs/bob/src/box.mjs @@ -1,7 +1,16 @@ -export default function (part) { - const { options, Point, Path, points, paths, Snippet, snippets, complete, sa, paperless, macro } = - part.shorthand() - +export default function ({ + options, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro, +}) { const w = 500 * options.size points.topLeft = new Point(0, 0) points.topRight = new Point(w, 0) diff --git a/designs/bob/src/index.mjs b/designs/bob/src/index.mjs index 77971f3b994..c11d4ea7c30 100644 --- a/designs/bob/src/index.mjs +++ b/designs/bob/src/index.mjs @@ -5,9 +5,8 @@ import { bib } from './bib.mjs' // Setup our new design const Bob = new Design({ data, - parts: [ bib ], + parts: [bib], }) //Named exports export { bib, Bob } -