diff --git a/packages/models/src/index.mjs b/packages/models/src/index.mjs index 6c43ffef787..a744fe8ead5 100644 --- a/packages/models/src/index.mjs +++ b/packages/models/src/index.mjs @@ -1,18 +1,18 @@ -import { measurements, neckstimate, SHEHER, HEHIM } from './neckstimate.mjs' +import { measurements, neckstimate, CISFEMALE, CISMALE } from './neckstimate.mjs' -const getMeasurements = (size, pronouns) => { +const getMeasurements = (size, index) => { const all = {} for (const m of measurements) { - all[m] = neckstimate(size * 10, m, pronouns) + all[m] = neckstimate(size * 10, m, index) } return all } -const multiplyMeasurements = (factor, pronouns) => { +const multiplyMeasurements = (factor, index) => { const all = {} for (const m of measurements) { - all[m] = factor * neckstimate(pronouns === 0 ? '340' : '380', m, pronouns) + all[m] = factor * neckstimate(index === 0 ? '340' : '380', m, index) } return all @@ -21,126 +21,126 @@ const multiplyMeasurements = (factor, pronouns) => { export const groups = [ 'adult', 'doll', 'giant' ] export const sizes = { - adultsheher: [28,30,32,34,36,38,40,42,44,46], - adulthehim: [32,34,36,38,40,42,44,46,48,50], - dollsheher: [10, 20, 30, 40, 50, 60], - dollhehim: [10, 20, 30, 40, 50, 60], - giantsheher: [150, 200, 250, 300], - gianthehim: [150, 200, 250, 300], + cisFemaleAdult: [28,30,32,34,36,38,40,42,44,46], + cisMaleAdult: [32,34,36,38,40,42,44,46,48,50], + cisFemaleDoll: [10, 20, 30, 40, 50, 60], + cisMaleDoll: [10, 20, 30, 40, 50, 60], + cisFemaleGiant: [150, 200, 250, 300], + cisMaleGiant: [150, 200, 250, 300], } -export const adultsheher28 = getMeasurements(28, SHEHER) -export const adultsheher30 = getMeasurements(30, SHEHER) -export const adultsheher32 = getMeasurements(32, SHEHER) -export const adultsheher34 = getMeasurements(34, SHEHER) -export const adultsheher36 = getMeasurements(36, SHEHER) -export const adultsheher38 = getMeasurements(38, SHEHER) -export const adultsheher40 = getMeasurements(40, SHEHER) -export const adultsheher42 = getMeasurements(42, SHEHER) -export const adultsheher44 = getMeasurements(44, SHEHER) -export const adultsheher46 = getMeasurements(46, SHEHER) +export const cisFemaleAdult28 = getMeasurements(28, CISFEMALE) +export const cisFemaleAdult30 = getMeasurements(30, CISFEMALE) +export const cisFemaleAdult32 = getMeasurements(32, CISFEMALE) +export const cisFemaleAdult34 = getMeasurements(34, CISFEMALE) +export const cisFemaleAdult36 = getMeasurements(36, CISFEMALE) +export const cisFemaleAdult38 = getMeasurements(38, CISFEMALE) +export const cisFemaleAdult40 = getMeasurements(40, CISFEMALE) +export const cisFemaleAdult42 = getMeasurements(42, CISFEMALE) +export const cisFemaleAdult44 = getMeasurements(44, CISFEMALE) +export const cisFemaleAdult46 = getMeasurements(46, CISFEMALE) -export const adulthehim32 = getMeasurements(32, HEHIM) -export const adulthehim34 = getMeasurements(34, HEHIM) -export const adulthehim36 = getMeasurements(36, HEHIM) -export const adulthehim38 = getMeasurements(38, HEHIM) -export const adulthehim40 = getMeasurements(40, HEHIM) -export const adulthehim42 = getMeasurements(42, HEHIM) -export const adulthehim44 = getMeasurements(44, HEHIM) -export const adulthehim46 = getMeasurements(46, HEHIM) -export const adulthehim48 = getMeasurements(48, HEHIM) -export const adulthehim50 = getMeasurements(50, HEHIM) +export const cisMaleAdult32 = getMeasurements(32, CISMALE) +export const cisMaleAdult34 = getMeasurements(34, CISMALE) +export const cisMaleAdult36 = getMeasurements(36, CISMALE) +export const cisMaleAdult38 = getMeasurements(38, CISMALE) +export const cisMaleAdult40 = getMeasurements(40, CISMALE) +export const cisMaleAdult42 = getMeasurements(42, CISMALE) +export const cisMaleAdult44 = getMeasurements(44, CISMALE) +export const cisMaleAdult46 = getMeasurements(46, CISMALE) +export const cisMaleAdult48 = getMeasurements(48, CISMALE) +export const cisMaleAdult50 = getMeasurements(50, CISMALE) -export const dollsheher10 = multiplyMeasurements(0.1, SHEHER) -export const dollsheher20 = multiplyMeasurements(0.2, SHEHER) -export const dollsheher30 = multiplyMeasurements(0.3, SHEHER) -export const dollsheher40 = multiplyMeasurements(0.4, SHEHER) -export const dollsheher50 = multiplyMeasurements(0.5, SHEHER) -export const dollsheher60 = multiplyMeasurements(0.6, SHEHER) +export const cisFemaleDoll10 = multiplyMeasurements(0.1, CISFEMALE) +export const cisFemaleDoll20 = multiplyMeasurements(0.2, CISFEMALE) +export const cisFemaleDoll30 = multiplyMeasurements(0.3, CISFEMALE) +export const cisFemaleDoll40 = multiplyMeasurements(0.4, CISFEMALE) +export const cisFemaleDoll50 = multiplyMeasurements(0.5, CISFEMALE) +export const cisFemaleDoll60 = multiplyMeasurements(0.6, CISFEMALE) -export const dollhehim10 = multiplyMeasurements(0.1, HEHIM) -export const dollhehim20 = multiplyMeasurements(0.2, HEHIM) -export const dollhehim30 = multiplyMeasurements(0.3, HEHIM) -export const dollhehim40 = multiplyMeasurements(0.4, HEHIM) -export const dollhehim50 = multiplyMeasurements(0.5, HEHIM) -export const dollhehim60 = multiplyMeasurements(0.6, HEHIM) +export const cisMaleDoll10 = multiplyMeasurements(0.1, CISMALE) +export const cisMaleDoll20 = multiplyMeasurements(0.2, CISMALE) +export const cisMaleDoll30 = multiplyMeasurements(0.3, CISMALE) +export const cisMaleDoll40 = multiplyMeasurements(0.4, CISMALE) +export const cisMaleDoll50 = multiplyMeasurements(0.5, CISMALE) +export const cisMaleDoll60 = multiplyMeasurements(0.6, CISMALE) -export const giantsheher150 = multiplyMeasurements(1.5, SHEHER) -export const giantsheher200 = multiplyMeasurements(2, SHEHER) -export const giantsheher250 = multiplyMeasurements(2.5, SHEHER) -export const giantsheher300 = multiplyMeasurements(3, SHEHER) +export const cisFemaleGiant150 = multiplyMeasurements(1.5, CISFEMALE) +export const cisFemaleGiant200 = multiplyMeasurements( 2, CISFEMALE) +export const cisFemaleGiant250 = multiplyMeasurements(2.5, CISFEMALE) +export const cisFemaleGiant300 = multiplyMeasurements( 3, CISFEMALE) -export const gianthehim150 = multiplyMeasurements(1.5, HEHIM) -export const gianthehim200 = multiplyMeasurements(2, HEHIM) -export const gianthehim250 = multiplyMeasurements(2.5, HEHIM) -export const gianthehim300 = multiplyMeasurements(3, HEHIM) +export const cisMaleGiant150 = multiplyMeasurements(1.5, CISMALE) +export const cisMaleGiant200 = multiplyMeasurements( 2, CISMALE) +export const cisMaleGiant250 = multiplyMeasurements(2.5, CISMALE) +export const cisMaleGiant300 = multiplyMeasurements( 3, CISMALE) -export const adultsheher = { - 28: adultsheher28, - 30: adultsheher30, - 32: adultsheher32, - 34: adultsheher34, - 36: adultsheher36, - 38: adultsheher38, - 40: adultsheher40, - 42: adultsheher42, - 44: adultsheher44, - 46: adultsheher46, +export const cisFemaleAdult = { + 28: cisFemaleAdult28, + 30: cisFemaleAdult30, + 32: cisFemaleAdult32, + 34: cisFemaleAdult34, + 36: cisFemaleAdult36, + 38: cisFemaleAdult38, + 40: cisFemaleAdult40, + 42: cisFemaleAdult42, + 44: cisFemaleAdult44, + 46: cisFemaleAdult46, } -export const adulthehim = { - 32: adulthehim32, - 34: adulthehim34, - 36: adulthehim36, - 38: adulthehim38, - 40: adulthehim40, - 42: adulthehim42, - 44: adulthehim44, - 46: adulthehim46, - 48: adulthehim48, - 50: adulthehim50, +export const cisMaleAdult = { + 32: cisMaleAdult32, + 34: cisMaleAdult34, + 36: cisMaleAdult36, + 38: cisMaleAdult38, + 40: cisMaleAdult40, + 42: cisMaleAdult42, + 44: cisMaleAdult44, + 46: cisMaleAdult46, + 48: cisMaleAdult48, + 50: cisMaleAdult50, } -export const adults = { - sheher: adultsheher, - hehim:adulthehim, +export const adult = { + cisFemale: cisFemaleAdult, + cisMale: cisMaleAdult, } -export const dollsheher = { - 10: dollsheher10, - 20: dollsheher20, - 30: dollsheher30, - 40: dollsheher40, - 50: dollsheher50, - 60: dollsheher60, +export const cisFemaleDoll = { + 10: cisFemaleDoll10, + 20: cisFemaleDoll20, + 30: cisFemaleDoll30, + 40: cisFemaleDoll40, + 50: cisFemaleDoll50, + 60: cisFemaleDoll60, } -export const dollhehim = { - 10: dollhehim10, - 20: dollhehim20, - 30: dollhehim30, - 40: dollhehim40, - 50: dollhehim50, - 60: dollhehim60, +export const cisMaleDoll = { + 10: cisMaleDoll10, + 20: cisMaleDoll20, + 30: cisMaleDoll30, + 40: cisMaleDoll40, + 50: cisMaleDoll50, + 60: cisMaleDoll60, } -export const dolls = { - sheher: dollsheher, - hehim: dollhehim, +export const doll = { + cisFemale: cisFemaleDoll, + cisMale: cisMaleDoll, } -export const giantsheher = { - 150: giantsheher150, - 200: giantsheher200, - 250: giantsheher250, - 300: giantsheher300, +export const cisFemaleGiant = { + 150: cisFemaleGiant150, + 200: cisFemaleGiant200, + 250: cisFemaleGiant250, + 300: cisFemaleGiant300, } -export const gianthehim = { - 150: gianthehim150, - 200: gianthehim200, - 250: gianthehim250, - 300: gianthehim300, +export const cisMaleGiant = { + 150: cisMaleGiant150, + 200: cisMaleGiant200, + 250: cisMaleGiant250, + 300: cisMaleGiant300, } -export const giants = { - sheher: giantsheher, - hehim: gianthehim, +export const giant = { + cisFemale: cisFemaleGiant, + cisMale: cisMaleGiant, } export { measurements } diff --git a/packages/models/src/neckstimate.mjs b/packages/models/src/neckstimate.mjs index e02912d7645..cf10f10b451 100644 --- a/packages/models/src/neckstimate.mjs +++ b/packages/models/src/neckstimate.mjs @@ -8,8 +8,8 @@ */ // This signifies the index in the array of a measurements' value -export const SHEHER = 0 -export const HEHIM = 1 +export const CISFEMALE = 0 +export const CISMALE = 1 const base = { ankle: [245, 235], diff --git a/packages/models/tests/models.test.mjs b/packages/models/tests/models.test.mjs index 0d0bd5b43d0..39e1957c4ad 100644 --- a/packages/models/tests/models.test.mjs +++ b/packages/models/tests/models.test.mjs @@ -7,7 +7,7 @@ const { measurements, sizes } = all describe('Measurements', () => { it("Measurements should be a named export and match the sizes", () => { for (const m of measurements) { - expect(typeof all.adultsheher28[m]).to.equal('number'); + expect(typeof all.cisFemaleAdult28[m]).to.equal('number'); } }) }) diff --git a/sites/shared/components/workbench/measurements/index.js b/sites/shared/components/workbench/measurements/index.js index e933ee2b327..7e68363860d 100644 --- a/sites/shared/components/workbench/measurements/index.js +++ b/sites/shared/components/workbench/measurements/index.js @@ -1,6 +1,6 @@ import React, {useMemo, useEffect, useState} from 'react' import MeasurementInput from '../inputs/measurement.js' -import { adults, dolls, giants } from '@freesewing/models' +import { adult, doll, giant } from '@freesewing/models' import WomenswearIcon from 'shared/components/icons/womenswear.js' import MenswearIcon from 'shared/components/icons/menswear.js' import { useTranslation } from 'next-i18next' @@ -9,11 +9,11 @@ import {settings} from '../menu/core-settings/index'; import { Tab, Tabs } from 'shared/components/mdx/tabs.js' -const groups = { adults, dolls, giants } +const groups = { adult, doll, giant } const icons = { - hehim: , - sheher: , + cisFemale: , + cisMale: , } @@ -57,7 +57,7 @@ const WorkbenchMeasurements = ({ app, design, gist, updateGist, gistReady }) => {t('measurements')}

{t('cfp:preloadMeasurements')}

- + {Object.keys(groups).map(group => ( {Object.keys(icons).map(type => ( @@ -71,7 +71,7 @@ const WorkbenchMeasurements = ({ app, design, gist, updateGist, gistReady }) => onClick={() => updateMeasurements(groups[group][type][m], false)} > {icons[type]} - { group === 'adults' + { group === 'adult' ? `${t('size')} ${m}` : `${m}%` } diff --git a/sites/shared/components/workbench/measurements/non-human.js b/sites/shared/components/workbench/measurements/non-human.js index 9472e93ee06..7d44effa177 100644 --- a/sites/shared/components/workbench/measurements/non-human.js +++ b/sites/shared/components/workbench/measurements/non-human.js @@ -2,12 +2,12 @@ import { dolls, giants } from '@freesewing/models' const nonHuman = { menswear: { - dolls: dolls.hehim, - giants: giants.hehim, + dolls: dolls.cisFemale, + giants: giants.cisMale, }, womenswear: { - dolls: dolls.sheher, - giants: giants.sheher, + dolls: dolls.cisFemale, + giants: giants.cisMale, } } const round = val => Math.round(val*10)/10 diff --git a/tests/designs/drafting.mjs b/tests/designs/drafting.mjs index 20a74ac96a0..98e1abd1117 100644 --- a/tests/designs/drafting.mjs +++ b/tests/designs/drafting.mjs @@ -1,5 +1,5 @@ import designs from "../../config/software/designs.json" assert { type: 'json' } -import { adults, dolls, giants } from '@freesewing/models' +import { adult, doll, giant } from '@freesewing/models' import { getFamily } from './config.mjs' import chai from 'chai' @@ -37,14 +37,14 @@ export const testPatternDrafting = (Pattern, log=false) => { */ if (family !== 'utilities') { describe('Draft for humans:', () => { - for (const type of ['sheher', 'hehim']) { + for (const type of ['cisFemale', 'cisMale']) { describe(type, () => { - for (const size in adults[type]) { + for (const size in adult[type]) { it(` - Drafting for size ${size}`, () => { expect( doesItDraftAndRender( new Pattern({ - measurements: adults[type][size] + measurements: adult[type][size] }), log ) ).to.equal(true) @@ -54,11 +54,11 @@ export const testPatternDrafting = (Pattern, log=false) => { } }) - // Do the same for fantastical models (dolls, giants) - const fams = { dolls, giants } - for (const family of ['dolls', 'giants']) { + // Do the same for fantastical models (doll, giant) + const fams = { doll, giant } + for (const family of ['doll', 'giant']) { describe(`Draft for ${family}:`, () => { - for (const type of ['sheher', 'hehim']) { + for (const type of ['cisFemale', 'cisMale']) { describe(type, () => { for (const size in fams[family][type]) { it(` - Drafting at ${size}%`, () => { diff --git a/tests/designs/sampling.mjs b/tests/designs/sampling.mjs index 1e957adb90c..efd0d0144dc 100644 --- a/tests/designs/sampling.mjs +++ b/tests/designs/sampling.mjs @@ -1,5 +1,5 @@ import designs from "../../config/software/designs.json" assert { type: 'json' } -import { adults, dolls, giants } from '@freesewing/models' +import { adult, doll, giant } from '@freesewing/models' import { getFamily } from './config.mjs' import chai from 'chai' @@ -49,7 +49,7 @@ export const testPatternSampling = (Pattern, log=false) => { type: 'measurement', measurement }, - measurements: adults.sheher["36"] + measurements: adult.cisFemale["36"] }), log)).to.equal(true) }) } @@ -69,7 +69,7 @@ export const testPatternSampling = (Pattern, log=false) => { type: 'option', option }, - measurements: adults.sheher["36"] + measurements: adult.cisFemale["36"] }), log)).to.equal(true) }) } @@ -81,13 +81,13 @@ export const testPatternSampling = (Pattern, log=false) => { /* * Sample pattern for different models */ - describe(`Sample humans:` , () => { - for (const type of ['sheher', 'hehim']) { - it(`Sample pattern for adults ${type} size range:` , () => { + describe(`Sample human measurements:` , () => { + for (const type of ['cisFemale', 'cisMale']) { + it(`Sample pattern for adult ${type} size range:` , () => { expect(doesItSample(new Pattern({ sample: { type: 'models', - models: adults[type], + models: adult[type], }, }), log)).to.equal(true) }) @@ -98,18 +98,18 @@ export const testPatternSampling = (Pattern, log=false) => { if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) { if (deprecated.indexOf(design) === -1) { /* - * Sample pattern for dolls & giants + * Sample pattern for doll & giant */ - for (const family of ['dolls', 'giants']) { - describe(`Sample ${family}:` , () => { - for (const type of ['sheher', 'hehim']) { + for (const family of ['doll', 'giant']) { + describe(`Sample ${family} measurements:` , () => { + for (const type of ['cisFemale', 'cisMale']) { it(`Sample pattern for ${family} ${type} size range:` , () => { expect(doesItSample(new Pattern({ sample: { type: 'models', - models: family === 'dolls' - ? dolls[type] - : giants[type] + models: family === 'doll' + ? doll[type] + : giant[type] }, }), log)).to.equal(true) })