From f1681cb45c8630be87f8784dc86a039a6228be9a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 30 Jun 2020 08:53:56 +0200 Subject: [PATCH] chore(holmes) Removed circumference suffix from measurements --- packages/holmes/config/index.js | 40 ++++++++++++++++----------------- packages/holmes/src/brim.js | 4 ++-- packages/holmes/src/ear.js | 7 ++---- packages/holmes/src/gore.js | 6 ++--- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/packages/holmes/config/index.js b/packages/holmes/config/index.js index 20a4b558082..908a44371d6 100644 --- a/packages/holmes/config/index.js +++ b/packages/holmes/config/index.js @@ -1,38 +1,38 @@ -import { version } from "../package.json"; +import { version } from '../package.json' // ?? 🤔 ?? --> https://en.freesewing.dev/packages/core/config export default { - name: "holmes", + name: 'holmes', version, - design: "AlfaLyr", - code: "AlfaLyr", - department: "accessories", - type: "pattern", + design: 'AlfaLyr', + code: 'AlfaLyr', + department: 'accessories', + type: 'pattern', difficulty: 3, tags: [ - "freesewing", - "design", - "diy", - "fashion", - "made to measure", - "parametric design", - "pattern", - "sewing", - "sewing pattern" + 'freesewing', + 'design', + 'diy', + 'fashion', + 'made to measure', + 'parametric design', + 'pattern', + 'sewing', + 'sewing pattern' ], optionGroups: { - style: ["lengthRatio", "goreNumber", "brimAngle", "brimWidth"] + style: ['lengthRatio', 'goreNumber', 'brimAngle', 'brimWidth'] }, - measurements: ["headCircumference"], + measurements: ['head'], dependencies: {}, inject: {}, hide: [], - parts: ["gore", "brim", "ear"], + parts: ['gore', 'brim', 'ear'], options: { lengthRatio: { pct: 55, min: 40, max: 60 }, goreNumber: { count: 6, min: 4, max: 20 }, - brimAngle: { deg: 45, min: 10, max:90 }, + brimAngle: { deg: 45, min: 10, max: 90 }, brimWidth: { mm: 30, min: 5, max: 100 } } -}; +} diff --git a/packages/holmes/src/brim.js b/packages/holmes/src/brim.js index 12f52ac2490..a3cd3278a08 100644 --- a/packages/holmes/src/brim.js +++ b/packages/holmes/src/brim.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, @@ -12,7 +12,7 @@ export default function(part) { macro } = part.shorthand() - let headRadius = measurements.headCircumference / 2 / Math.PI + let headRadius = measurements.head / 2 / Math.PI let brimRadius = headRadius / Math.sin((options.brimAngle * Math.PI) / 180) let sectorAngle = Math.PI / 3 let brimSectorAngle = (sectorAngle * headRadius) / brimRadius diff --git a/packages/holmes/src/ear.js b/packages/holmes/src/ear.js index 9c4c281ed1b..de24588f095 100644 --- a/packages/holmes/src/ear.js +++ b/packages/holmes/src/ear.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, @@ -17,10 +17,7 @@ export default function(part) { // Design pattern here points.top = new Point(0, 0) - points.bottom = new Point( - measurements.headCircumference / 12, - (options.lengthRatio * measurements.headCircumference) / 2 - ) + points.bottom = new Point(measurements.head / 12, (options.lengthRatio * measurements.head) / 2) points.topC = points.top.shift(0, points.bottom.x) points.bottomC = points.bottom.shift(90, points.bottom.y - points.bottom.x) points.topCFlipped = points.topC.flipX() diff --git a/packages/holmes/src/gore.js b/packages/holmes/src/gore.js index 5c5be0ddc15..665db090061 100644 --- a/packages/holmes/src/gore.js +++ b/packages/holmes/src/gore.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, @@ -15,7 +15,7 @@ export default function(part) { // Design pattern here //Radius of the head - let headRadius = measurements.headCircumference / 2 / Math.PI + let headRadius = measurements.head / 2 / Math.PI points.p0 = new Point(0, 0) @@ -23,7 +23,7 @@ export default function(part) { from: points.p0, radius: headRadius, goreNumber: options.goreNumber, - extraLength: ((options.lengthRatio - 0.5) * measurements.headCircumference) / 2, + extraLength: ((options.lengthRatio - 0.5) * measurements.head) / 2, prefix: 'gore_', render: true })