From 007df0623524a3ec09546aca2d91999f46a9dc5d Mon Sep 17 00:00:00 2001 From: WV Admin Date: Wed, 21 Aug 2019 08:55:57 -0700 Subject: [PATCH 1/6] Adding Waralee --- packages/waralee/README.md | 31 +++ packages/waralee/config/index.js | 73 +++++++ packages/waralee/example/.babelrc | 10 + packages/waralee/example/README.md | 96 +++++++++ packages/waralee/example/package.json | 47 +++++ packages/waralee/example/public/favicon.ico | Bin 0 -> 12053 bytes packages/waralee/example/public/index.html | 40 ++++ packages/waralee/example/public/manifest.json | 15 ++ packages/waralee/example/src/App.js | 22 ++ packages/waralee/example/src/App.test.js | 9 + packages/waralee/example/src/index.js | 11 + packages/waralee/example/src/serviceWorker.js | 127 ++++++++++++ packages/waralee/package.json | 66 ++++++ packages/waralee/rollup.config.js | 47 +++++ packages/waralee/src/.eslintrc | 5 + packages/waralee/src/cutout.js | 86 ++++++++ packages/waralee/src/facings.js | 99 +++++++++ packages/waralee/src/index.js | 22 ++ packages/waralee/src/mini.js | 158 +++++++++++++++ packages/waralee/src/pants.js | 148 ++++++++++++++ packages/waralee/src/pantsproto.js | 189 ++++++++++++++++++ packages/waralee/src/pocket.js | 98 +++++++++ packages/waralee/src/util.js | 35 ++++ 23 files changed, 1434 insertions(+) create mode 100755 packages/waralee/README.md create mode 100755 packages/waralee/config/index.js create mode 100755 packages/waralee/example/.babelrc create mode 100755 packages/waralee/example/README.md create mode 100755 packages/waralee/example/package.json create mode 100755 packages/waralee/example/public/favicon.ico create mode 100755 packages/waralee/example/public/index.html create mode 100755 packages/waralee/example/public/manifest.json create mode 100755 packages/waralee/example/src/App.js create mode 100755 packages/waralee/example/src/App.test.js create mode 100755 packages/waralee/example/src/index.js create mode 100755 packages/waralee/example/src/serviceWorker.js create mode 100755 packages/waralee/package.json create mode 100755 packages/waralee/rollup.config.js create mode 100755 packages/waralee/src/.eslintrc create mode 100755 packages/waralee/src/cutout.js create mode 100755 packages/waralee/src/facings.js create mode 100755 packages/waralee/src/index.js create mode 100755 packages/waralee/src/mini.js create mode 100755 packages/waralee/src/pants.js create mode 100755 packages/waralee/src/pantsproto.js create mode 100755 packages/waralee/src/pocket.js create mode 100755 packages/waralee/src/util.js diff --git a/packages/waralee/README.md b/packages/waralee/README.md new file mode 100755 index 00000000000..d3d7540e22c --- /dev/null +++ b/packages/waralee/README.md @@ -0,0 +1,31 @@ +# waralee + +> wrap pants + +[![NPM](https://img.shields.io/npm/v/waralee.svg)](https://www.npmjs.com/package/waralee) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) + +## Install + +```bash +npm install --save waralee +``` + +## Usage + +```jsx +import React, { Component } from 'react' + +import MyComponent from 'waralee' + +class Example extends Component { + render () { + return ( + + ) + } +} +``` + +## License + + © [woutervdub](https://github.com/woutervdub) diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js new file mode 100755 index 00000000000..db68b75ce87 --- /dev/null +++ b/packages/waralee/config/index.js @@ -0,0 +1,73 @@ +import { version } from "../package.json"; + +// ?? 🤔 ?? --> https://en.freesewing.dev/packages/core/config + +export default { + name: "waralee", + version: "0.0.1", + design: "woutervdub", + code: "woutervdub", + department: "menswear", + type: "pattern", + difficulty: 3, + tags: [ + "freesewing", + "design", + "diy", + "fashion", + "made to measure", + "parametric design", + "pattern", + "sewing", + "sewing pattern" + ], + optionGroups: { + fit: [ + "waistRaise", + "legShortening", + "waistOverlap", + "crotchFront", + "crotchBack", + "crotchFactorBackHor", + "crotchFactorBackVer", + "crotchFactorFrontHor", + "crotchFactorFrontVer", + "backRaise" + ] + }, + measurements: [ + "hipsCircumference", + "seatCircumference", + "inseam", + "seatDepth" + ], + dependencies: {}, + inject: {pants:"pantsproto", + mini:"pantsproto"}, + hide: [], + parts: ["cutout", "pocket", "facings"], + options: { + minimizer: 5, + frontPocketVerticalOffset: 0.07, + frontPocketHorizontalOffset: 0.18, + frontPocketSize: 0.65, + frontPocket: { bool: true }, + frontPocketDepthFactor: 1.6, + backPocketVerticalOffset: 0.15, + backPocketHorizontalOffset: 0.045, + backPocketSize: 0.65, + backPocket: { bool: true }, + hem: {mm: 15, min: 0, max: 100}, + waistBand: {mm: 25, min: 0, max: 100}, + waistRaise: { pct: 20, min: 0, max: 40 }, + crotchBack: { pct: 45, min: 10, max: 70 }, + crotchFront: { pct: 30, min: 10, max: 70 }, + crotchFactorFrontHor: { pct: 85, min: 10, max: 100 }, + crotchFactorFrontVer: { pct: 25, min: 10, max: 70 }, + crotchFactorBackHor: { pct: 90, min: 10, max: 100 }, + crotchFactorBackVer: { pct: 60, min: 20, max: 90 }, + waistOverlap: { pct: 50, min: 10, max: 100 }, + legShortening: { pct: 25, min: 0, max: 50 }, + backRaise: { pct: 10, min: 0, max: 25 } + } +}; diff --git a/packages/waralee/example/.babelrc b/packages/waralee/example/.babelrc new file mode 100755 index 00000000000..6e3090a4956 --- /dev/null +++ b/packages/waralee/example/.babelrc @@ -0,0 +1,10 @@ +{ + "plugins": [ + ["prismjs", { + "languages": ["javascript", "css", "markup"], + "plugins": ["line-numbers"], + "theme": "twilight", + "css": true + }] + ] +} diff --git a/packages/waralee/example/README.md b/packages/waralee/example/README.md new file mode 100755 index 00000000000..9dcb1665c16 --- /dev/null +++ b/packages/waralee/example/README.md @@ -0,0 +1,96 @@ +

+Freesewing logo +
+FreeSewing v2 +

+

A JavaScript library for made-to-measure sewing patterns

+

Follow @freesewing_org on Twitter + Chat with us on Gitter + Become a FreeSewing Patron + Follow @freesewing_org on Twitter + +

+ +# waralee example + +This project was bootstrapped with [Create Freesewing Pattern](https://en.freesewing.dev/create-freesewing-pattern): + +```js +npm init freesewing-pattern +``` + +This example folder is part of the local development environment. +It is **not** part of the pattern's source code. + +To run this example, follow these steps: + + - In the folder above this one, run: `yarn start` (or `npm start`) + - Then, in new terminal, run the same command in this folder: `yarn start` (or `npm start`) + +This will spin up the development environment, similar to [our online demo](https://test34.freesewing.dev/). + +## About FreeSewing 🤔 + +Where the world of makers and developers collide, that's where you'll find FreeSewing. + +Our [core library](https://freesewing.dev/en/freesewing) is a *batteries-included* toolbox +for parametric design of sewing patterns. It's a modular system (check our list +of [plugins](https://freesewing.dev/en/plugins) and getting started is as simple as: + +```bash +npm init freesewing-pattern +``` + +The [getting started] section on [freesewing.dev](https://freesewing.dev/) is a good +entrypoint to our documentation, but you'll find a lot more there, including +our [API documentation](https://freesewing.dev/en/freesewing/api), +as well as [examples](https://freesewing.dev/en/freesewing/examples), +and [best practices](https://freesewing.dev/en/do). + +If you're a maker, checkout [freesewing.org](https://freesewing/) where you can generate +our sewing patterns adapted to your measurements. + +## Support FreeSewing: Become a patron 🥰 + +FreeSewing is an open source project run by a community, +and financially supported by our patrons. + +If you feel what we do is worthwhile, you too +should [become a patron](https://freesewing.org/patrons/join). + +## Links 👩‍💻 + + - 💻 Makers website: [freesewing.org](https://freesewing.org) + - 💻 Developers website: [freesewing.dev](https://freesewing.org) + - 💬 Chat: [gitter.im/freesewing](https://gitter.im/freesewing/freesewing) + - 🐦 Twitter: [@freesewing_org](https://twitter.com/freesewing_org) + - 📷 Instagram: [@freesewing_org](https://instagram.com/freesewing_org) + +## License: MIT 🤓 + +© [Joost De Cock](https://github.com/joostdecock). +See [the license file](https://github.com/freesewing/freesewing/blob/develop/LICENSE) for details. + +## Where to get help 🤯 + +Our [chatroom on Gitter](https://gitter.im) is the best place to ask questions, +share your feedback, or just hang out. + +If you want to report a problem, please [create an issue](https://github.com/freesewing/freesewing/issues/new). + diff --git a/packages/waralee/example/package.json b/packages/waralee/example/package.json new file mode 100755 index 00000000000..e93096a0896 --- /dev/null +++ b/packages/waralee/example/package.json @@ -0,0 +1,47 @@ +{ + "name": "waralee-example", + "homepage": "https://woutervdub.github.io/waralee", + "version": "0.0.0", + "private": true, + "dependencies": { + "@freesewing/components": "beta", + "@freesewing/core": "beta", + "@freesewing/css-theme": "beta", + "@freesewing/i18n": "beta", + "@freesewing/models": "beta", + "@freesewing/mui-theme": "beta", + "@freesewing/pattern-info": "beta", + "@freesewing/plugin-bundle": "beta", + "@freesewing/plugin-theme": "beta", + "@freesewing/plugin-i18n": "beta", + "@freesewing/plugin-svgattr": "beta", + "@freesewing/utils": "beta", + "@material-ui/core": "^4.0.1", + "@material-ui/icons": "^4.0.1", + "@material-ui/lab": "^v4.0.0-alpha.14", + "pattern": "file:..", + "prismjs": "1.16.0", + "react": "^16.8", + "react-dom": "^16.8", + "react-scripts": "^3.0.0", + "typeface-roboto-condensed": "latest" + }, + "scripts": { + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject" + }, + "eslintConfig": { + "extends": "react-app" + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ], + "devDependencies": { + "babel-plugin-prismjs": "1.0.2" + } +} diff --git a/packages/waralee/example/public/favicon.ico b/packages/waralee/example/public/favicon.ico new file mode 100755 index 0000000000000000000000000000000000000000..95061a260f10f9f0fb6464069a6d65df8dc8a471 GIT binary patch literal 12053 zcmZQzU}Ruq00Bk@1&0563=Con3=EwCe(tgbC?LeQ2nsxfK}sMrrE6L9$cQ!&TshX)29^&uC!fvqkJK9 zLAyhI<7ZYjju^#)tp`GxrgMKezW?O;FCrE(3z+?`yZx}M{FU}gGv~;W^?mp6`ajTY zlxOu)_+kC=zxkt?6(1{)d@Gs46zQK}-)P5V&b>#&AUL7%fK;O{lQoN02gA&TO!Mz* zeb{}VsPR2Z8pj^h4?PF&GF|7G!+TW8_tRe1Zz35A0l}Kx({!W%t(>95vUin(ZevVi z8IwBaotFDwyB%gelibe9bNv0o-UG_h)IP>B?PZk{`yrE7IFpz0yU^4Cu}dQHx*I$m zWH>COxSYZFH^ZghUzajYmPZu2CUEioSWeom;A2j>R~>6xs8@z zpZ@*9(YT#;+wqVOPfZsJKWj2)>%TGMwydO;KZpPBpMpt28_gV^3ZM-IK= zGEy#@b)fT3tGCiQYg6o07luMfq{F)x1;@!)yr=ydidO-Pav&!EqF1~?X*k&UB=FAssSNz~{(tW} zrf%(I)tfM*-9;yi$;L*!Zf5T{KJgzca+6}dYJ@S_>=F8>b;9%i#8z#Sh!b87?c#^@ zrDI~aqqN1=e28SKk$o_6%Srv)1-2*S{$2RZa>MY%;f)_oADPE5n3UwmWv;T{K~bAg z&hOoC`;8A=xHj=0mRrM65y4qsT5|JmFRR+5lTM2tUVg}X{;~Wa{pv4wyVS&V3@*BG z-db)fYuUg5>&wY^ij{LqHm0`7zrOHq&R<5IKf8^7&+E-RK5s`7pOtCqlc!HN8XURt zCcmTZ`PTJ70WChPq9_}00=E}r#~=ATIpj||VfeD34eXtsvsk?NnD zE1qd5GbV7@^nTFi_TXuWSNj=rbW1D`^V$ggZA^>w{|MFYNMv_zez{6svHt~Ey?W!( zJvSw#rYJK{S=-Q|#ckhjo&0qbP&{T{4oFDrd{tv?_KCoF_?XOV*C9s`x&0j z-?LEiWWux_nU#D2HiwonsQkUmzo%1DPx0`vbZsHQbuv8dAH4P7aopR()4##@L22XU z3-ueM;(43i{;+P++$*7{7`dR{RHQrCJ-*|*qg?Uw0|t$=S=ttaR<66#{OQ&KW!vTZ zO|GhaU`wkA(9*HCi&y{P%M>4^IjLh^;L9VQ3?5CCJ3im!^0rTGX%!9Z2c%SIwp4TR zxQD!~O^~rrdAi^9QMThR(S|i2=O2=u{!nnA$PM3_UzW@=kzS$XUscA#_WX-IE1&ee zJv{mwJhzHI7VKLx-*Zo<^WpRI)6(}&^Zm`hpERpf{Kla}qFiTK1z+zHuvz`(NBTx4 zj=DSlEydPcNZ9F6{lR#T%m=5nt}#k7HLMq+5+u39Rv1WRt7q;!FBBp0KxIMR8iuB~ ze|FDUx!1YfpXJrbug)uc!*chDUnrG1Q`hi7i=ooKx|daJO6m7@A=U|vI=h}T-B_3@ zGr5H&obd^#PGTdMYTgoc?SK3C9azzz*_eO9v8z?Df$Kqq-cMfLd*<7o9h!A&^})%E zyZF|Kzc|6AFys6G*%1?*x}>Ppw$kzZ0?8jT*Dy3m{*yl6BogIu`mM#{ z1i|?ZikAwTKddp|tZY!hrQrS`TWm?dW2w0bg52v@AGpO}^IUrcbHYRJ2}~2zk9dhK z3V1BJd9rBze9Z#qx?i(*oNH>H)T-~mwSas1e>Wxh1>0sO2-Y8PXZ#Q@vVnFb`~;aa9CwvR!xfjgo>X`;ZDlU^G>{l9+q?bW=6%-jJg1_l!Y1hp0B z*7To0ta;LD#yLj|hPKTgT$svLtRg%0AD9??TlUy;xumgp9^ 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 literal 0 HcmV?d00001 diff --git a/packages/waralee/example/public/index.html b/packages/waralee/example/public/index.html new file mode 100755 index 00000000000..203d45f5303 --- /dev/null +++ b/packages/waralee/example/public/index.html @@ -0,0 +1,40 @@ + + + + + + + + + + + waralee + + + +
+ + + diff --git a/packages/waralee/example/public/manifest.json b/packages/waralee/example/public/manifest.json new file mode 100755 index 00000000000..c5fcfde17bb --- /dev/null +++ b/packages/waralee/example/public/manifest.json @@ -0,0 +1,15 @@ +{ + "short_name": "waralee", + "name": "waralee", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/packages/waralee/example/src/App.js b/packages/waralee/example/src/App.js new file mode 100755 index 00000000000..e7936330e5d --- /dev/null +++ b/packages/waralee/example/src/App.js @@ -0,0 +1,22 @@ +import React from "react"; +import freesewing from "@freesewing/core"; +import Workbench from "@freesewing/components/Workbench"; +import "typeface-roboto-condensed"; +import "@freesewing/css-theme"; + +import Pattern from "pattern"; + +const App = props => { + let instance = new Pattern(); + let config = instance.config; + return ( + + ); +}; + +export default App; diff --git a/packages/waralee/example/src/App.test.js b/packages/waralee/example/src/App.test.js new file mode 100755 index 00000000000..23c181f0276 --- /dev/null +++ b/packages/waralee/example/src/App.test.js @@ -0,0 +1,9 @@ +import React from "react"; +import ReactDOM from "react-dom"; +import App from "./App"; + +it("renders without crashing", () => { + const div = document.createElement("div"); + ReactDOM.render(, div); + ReactDOM.unmountComponentAtNode(div); +}); diff --git a/packages/waralee/example/src/index.js b/packages/waralee/example/src/index.js new file mode 100755 index 00000000000..7900787a4d2 --- /dev/null +++ b/packages/waralee/example/src/index.js @@ -0,0 +1,11 @@ +import React from "react"; +import ReactDOM from "react-dom"; +import App from "./App"; +import * as serviceWorker from "./serviceWorker"; + +ReactDOM.render(, document.getElementById("root")); + +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: http://bit.ly/CRA-PWA +serviceWorker.unregister(); diff --git a/packages/waralee/example/src/serviceWorker.js b/packages/waralee/example/src/serviceWorker.js new file mode 100755 index 00000000000..68fda5a0eb6 --- /dev/null +++ b/packages/waralee/example/src/serviceWorker.js @@ -0,0 +1,127 @@ +// In production, we register a service worker to serve assets from local cache. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on the "N+1" visit to a page, since previously +// cached resources are updated in the background. + +// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. +// This link also includes instructions on opting out of this behavior. + +const isLocalhost = Boolean( + window.location.hostname === "localhost" || + // [::1] is the IPv6 localhost address. + window.location.hostname === "[::1]" || + // 127.0.0.1/8 is considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) +); + +export function register(config) { + if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL(process.env.PUBLIC_URL, window.location); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } + + window.addEventListener("load", () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); + + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + "This web app is being served cache-first by a service " + + "worker. To learn more, visit https://goo.gl/SC7cgQ" + ); + }); + } else { + // Is not local host. Just register service worker + registerValidSW(swUrl, config); + } + }); + } +} + +function registerValidSW(swUrl, config) { + navigator.serviceWorker + .register(swUrl) + .then(registration => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + installingWorker.onstatechange = () => { + if (installingWorker.state === "installed") { + if (navigator.serviceWorker.controller) { + // At this point, the old content will have been purged and + // the fresh content will have been added to the cache. + // It's the perfect time to display a "New content is + // available; please refresh." message in your web app. + console.log("New content is available; please refresh."); + + // Execute callback + if (config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log("Content is cached for offline use."); + + // Execute callback + if (config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch(error => { + console.error("Error during service worker registration:", error); + }); +} + +function checkValidServiceWorker(swUrl, config) { + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl) + .then(response => { + // Ensure service worker exists, and that we really are getting a JS file. + if ( + response.status === 404 || + response.headers.get("content-type").indexOf("javascript") === -1 + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then(registration => { + registration.unregister().then(() => { + window.location.reload(); + }); + }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + "No internet connection found. App is running in offline mode." + ); + }); +} + +export function unregister() { + if ("serviceWorker" in navigator) { + navigator.serviceWorker.ready.then(registration => { + registration.unregister(); + }); + } +} diff --git a/packages/waralee/package.json b/packages/waralee/package.json new file mode 100755 index 00000000000..f23caee7b79 --- /dev/null +++ b/packages/waralee/package.json @@ -0,0 +1,66 @@ +{ + "name": "waralee", + "version": "0.0.1", + "description": "", + "author": "woutervdub", + "license": "MIT", + "repository": "woutervdub/waralee", + "main": "dist/index.js", + "module": "dist/index.es.js", + "jsnext:main": "dist/index.es.js", + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "scripts": { + "test": "cross-env CI=1 react-scripts test --env=jsdom", + "test:watch": "react-scripts test --env=jsdom", + "build": "rollup -c", + "start": "rollup -c -w", + "prepare": "npm run build", + "predeploy": "cd example && npm install && npm run build", + "deploy": "gh-pages -d example/build" + }, + "devDependencies": { + "react": "^16.8", + "react-dom": "^16.8", + "@babel/plugin-proposal-class-properties": "^7.0.0", + "babel-eslint": "10.0.1", + "eslint": "^5.16.0", + "babel-jest": "24.7.1", + "jest": "24.7.1", + "@freesewing/core": "beta", + "@freesewing/plugin-bundle": "beta", + "@freesewing/components": "beta", + "@freesewing/css-theme": "beta", + "@freesewing/i18n": "beta", + "@freesewing/mui-theme": "beta", + "@freesewing/patterns": "beta", + "@freesewing/plugin-bust": "beta", + "@freesewing/plugin-buttons": "beta", + "@freesewing/plugin-debug": "beta", + "@freesewing/plugin-designer": "beta", + "@freesewing/plugin-flip": "beta", + "@freesewing/utils": "beta", + "@svgr/rollup": "^2.4.1", + "cross-env": "^5.1.4", + "gh-pages": "^1.2.0", + "react-scripts": "^3.0.1", + "webpack": "4.29.6", + "rollup": "^0.64.1", + "rollup-plugin-babel": "^4.0.1", + "rollup-plugin-babel-minify": "^7.0.0", + "rollup-plugin-commonjs": "^9.1.3", + "rollup-plugin-json": "^3.1.0", + "rollup-plugin-node-resolve": "^3.3.0", + "rollup-plugin-peer-deps-external": "^2.2.0", + "rollup-plugin-postcss": "^1.6.2", + "rollup-plugin-url": "^1.4.0", + "@material-ui/core": "^4.0.1", + "@material-ui/icons": "^4.0.1", + "@material-ui/lab": "^v4.0.0-alpha.14", + "react-intl": "2.8.0", + "prop-types": "15.7.2", + "file-saver": "^2.0.2" + } +} diff --git a/packages/waralee/rollup.config.js b/packages/waralee/rollup.config.js new file mode 100755 index 00000000000..70c428bd463 --- /dev/null +++ b/packages/waralee/rollup.config.js @@ -0,0 +1,47 @@ +import babel from "rollup-plugin-babel"; +import commonjs from "rollup-plugin-commonjs"; +import external from "rollup-plugin-peer-deps-external"; +import postcss from "rollup-plugin-postcss"; +import json from "rollup-plugin-json"; +import resolve from "rollup-plugin-node-resolve"; +import url from "rollup-plugin-url"; +import svgr from "@svgr/rollup"; +import minify from "rollup-plugin-babel-minify"; +import { name, version, description, author, license } from "./package.json"; + +import pkg from "./package.json"; + +export default { + input: "src/index.js", + output: [ + { + file: pkg.main, + format: "cjs", + sourcemap: true + }, + { + file: pkg.module, + format: "es", + sourcemap: true + } + ], + plugins: [ + external(), + postcss({ + modules: true + }), + url({ exclude: ["**/*.svg"] }), + svgr(), + babel({ + exclude: "node_modules/**" + }), + resolve({ browser: true }), + json(), + commonjs(), + minify({ + comments: false, + sourceMap: true, + banner: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` + }) + ] +}; diff --git a/packages/waralee/src/.eslintrc b/packages/waralee/src/.eslintrc new file mode 100755 index 00000000000..55f121d152d --- /dev/null +++ b/packages/waralee/src/.eslintrc @@ -0,0 +1,5 @@ +{ + "env": { + "jest": true + } +} diff --git a/packages/waralee/src/cutout.js b/packages/waralee/src/cutout.js new file mode 100755 index 00000000000..80ece1e99e3 --- /dev/null +++ b/packages/waralee/src/cutout.js @@ -0,0 +1,86 @@ +import { CreateCrotchPoints } from "./util"; + +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let seatDepth = measurements.seatDepth + (measurements.seatDepth *options.waistRaise ); + let circumference = measurements.seatCircumference; + let circumference4 = circumference / 4; + + points.mWaist = new Point(0, 0); + points.mHip = points.mWaist.shift(270, seatDepth); + + CreateCrotchPoints(part); + + points.mWaist1 = new Point( points.mWaist.x, points.fWaistSide.y ); + points.mWaist2 = new Point( points.mWaist.x, points.bWaistSide.y ); + + paths.seam = new Path() + .move(points.mWaist1) + .line(points.fWaistSide) + .curve(points.fWaistCrotchCP, points.fHipCrotchCP, points.mHip) + .curve(points.bHipCrotchCP, points.bWaistCrotchCP, points.bWaistSide) + .line(points.mWaist2) + .line(points.mWaist1) + .close() + .attr("class", "fabric"); + + + // Complete? + if (complete) { + points.logo = points.mWaist.shift(270, 75); + snippets.logo = new Snippet("logo", points.logo); + points.text = points.logo + .shift(-90, 25) + .attr("data-text", "Waralee") + .attr("data-text-class", "center"); + + if (sa) { + paths.seamAlternate = new Path() + .move(points.bWaistSide) + .curve(points.bWaistCrotchCP, points.bHipCrotchCP, points.mHip) + .curve(points.fHipCrotchCP, points.fWaistCrotchCP, points.fWaistSide); + + paths.sa = paths.seamAlternate.offset(sa).attr("class", "fabric sa"); + } + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.fWaistSide, + to: points.mWaist, + y: points.mWaist.y + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistSide, + y: points.mWaist.y + }); + macro("vd", { + from: points.mWaist1, + to: points.mHip, + x: points.mWaist.x + }); + macro("vd", { + from: points.mWaist2, + to: points.mWaist1, + x: points.mWaist.x +15 + }); + } + + return part; +} diff --git a/packages/waralee/src/facings.js b/packages/waralee/src/facings.js new file mode 100755 index 00000000000..2da2167819e --- /dev/null +++ b/packages/waralee/src/facings.js @@ -0,0 +1,99 @@ +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let frontPocketSize = options.frontPocketSize * measurements.seatDepth; + let backPocketSize = options.backPocketSize * measurements.seatDepth; + + points.frontTL = new Point(0, 0); + points.frontTR = points.frontTL.shift(0, frontPocketSize + 24); + points.frontBL = points.frontTL.shift(270, frontPocketSize / 2); + points.frontBR = points.frontTR.shift(270, frontPocketSize / 2); + + points.backTL = points.frontBL.shift(270, 50); + points.backTR = points.backTL.shift(0, backPocketSize + 24); + points.backBL = points.backTL.shift(270, backPocketSize / 2); + points.backBR = points.backTR.shift(270, backPocketSize / 2); + + paths.frontSeam = new Path() + .move(points.frontTL) + .line(points.frontBL) + .line(points.frontBR) + .line(points.frontTR) + .line(points.frontTL) + .close() + .attr("class", "fabric"); + paths.backSeam = new Path() + .move(points.backTL) + .line(points.backBL) + .line(points.backBR) + .line(points.backTR) + .line(points.backTL) + .close() + .attr("class", "fabric"); + + // Complete? + if (complete) { + points.frontTitle = points.frontTL.shift(270, 15).shift(0, 50); + macro("title", { + at: points.frontTitle.shift(0,30), + title: "1x fromFabric" + }); + points.frontLogo = points.frontTitle.shift(270, 15); + snippets.frontLogo = new Snippet("logo", points.frontLogo).attr("data-scale", 0.4); + points.frontText = points.frontLogo + .shift(-90, 25) + .attr("data-text", "Waralee") + .attr("data-text-class", "center"); + + points.backTitle = points.backTL.shift(270, 15).shift(0, 50); + macro("title", { + at: points.backTitle.shift(0,30), + title: "1x fromFabric" + }); + points.backLogo = points.backTitle.shift(270, 15); + snippets.backLogo = new Snippet("logo", points.backLogo).attr("data-scale", 0.4); + points.backText = points.backLogo + .shift(-90, 25) + .attr("data-text", "Waralee") + .attr("data-text-class", "center"); + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.frontTL, + to: points.frontTR, + y: points.frontTL.y + 15 + }); + macro("hd", { + from: points.backTL, + to: points.backTR, + y: points.backTL.y + 15 + }); + macro("vd", { + from: points.frontTL, + to: points.frontBL, + x: points.frontTL.x + 15 + }); + macro("vd", { + from: points.backTL, + to: points.backBL, + x: points.backTL.x + 15 + }); + } + + return part; +} diff --git a/packages/waralee/src/index.js b/packages/waralee/src/index.js new file mode 100755 index 00000000000..20d6bcfbc11 --- /dev/null +++ b/packages/waralee/src/index.js @@ -0,0 +1,22 @@ +import freesewing from "@freesewing/core"; +import plugins from "@freesewing/plugin-bundle"; +import config from "../config"; +import draftPantsproto from "./pantsproto"; +import draftPants from "./pants"; +import draftCutout from "./cutout"; +import draftPocket from "./pocket"; +import draftFacings from "./facings"; +import draftMini from "./mini"; + +// Create new design +const Pattern = new freesewing.Design(config, plugins); + +// Attach the draft methods to the prototype +Pattern.prototype.draftPantsproto = draftPantsproto; +Pattern.prototype.draftPants = draftPants; +Pattern.prototype.draftCutout = draftCutout; +Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftFacings = draftFacings; +Pattern.prototype.draftMini = draftMini; + +export default Pattern; diff --git a/packages/waralee/src/mini.js b/packages/waralee/src/mini.js new file mode 100755 index 00000000000..92647aa91ec --- /dev/null +++ b/packages/waralee/src/mini.js @@ -0,0 +1,158 @@ +// This is an idea to keep the printing to a minimum. The whole patterns is rather large. +// To keep you from printing it completely, you could print this part in paperless mode +// and only have a single sheet with all the dimensions on it. + +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let mini = options.minimizer; + + for( var p in points ) { + points[p].x = points[p].x /mini; + points[p].y = points[p].y /mini; + } + + + paths.waistFoldBack = paths.waistBack + .offset(-1 * options.waistBand/mini) + .attr("class", "fabric stroke-sm"); + paths.waistFoldFront = paths.waistFront + .offset(-1 * options.waistBand/mini) + .attr("class", "fabric stroke-sm"); + + paths.frontFold = paths.front + .offset(-1 * options.hem/mini) + .attr("class", "fabric stroke-sm"); + paths.legFold = paths.leg + .offset(-1 * options.hem/mini) + .attr("class", "fabric stroke-sm"); + paths.backFold = paths.back + .offset(-1 * options.hem/mini) + .attr("class", "fabric stroke-sm"); + + + + // Complete? + if (complete) { + points.logo = points.fWaistFront.shift(270, 400); + snippets.logo = new Snippet("logo", points.logo); + points.text = points.logo + .shift(-90, 50) + .attr("data-text", "hello") + .attr("data-text-class", "center"); + + if (sa) { + paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); + } + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.fWaistSide, + to: points.mWaist, + y: points.fWaistSide.y, + text: part.units(points.fWaistSide.dist(points.mWaist)*mini) + }); + /* + macro("hd", { + from: points.fWaistFrontOverlap, + to: points.mWaist, + y: points.fWaistSide.y - sa - 15 + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistSide, + y: points.bWaistSide.y + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistBack, + y: points.bWaistSide.y - sa - 15 + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistBackOverlap, + y: points.bWaistSide.y - sa - 30 + }); + macro("vd", { + from: points.mWaist, + to: points.mHip, + x: points.mWaist.x + }); + macro("vd", { + from: points.bWaistSide, + to: points.bWaistBack, + x: points.bWaistSide.x + 15 + }); + macro("vd", { + from: points.bWaistBackOverlap, + to: points.bLegBackOverlap, + x: points.bLegBackOverlap.x - 30 + }); + + if (options.frontPocket) { + macro("vd", { + from: points.fWaistSide, + to: points.frontPocketTop, + x: points.frontPocketTop.x + }); + macro("vd", { + from: points.fWaistSide, + to: points.frontPocketBottom, + x: points.frontPocketBottom.x + }); + macro("hd", { + from: points.frontPocketTop, + to: points.fWaistSide, + y: points.frontPocketTop.y + }); + macro("hd", { + from: points.frontPocketBottom, + to: points.fWaistSide, + y: points.frontPocketBottom.y + }); + } + if (options.backPocket) { + macro("vd", { + from: points.bWaistSide, + to: points.backPocketLeft, + x: points.backPocketLeft.x + }); + macro("vd", { + from: points.bWaistSide, + to: points.backPocketRight, + x: points.backPocketRight.x + }); + macro("hd", { + from: points.bWaistSide, + to: points.backPocketLeft, + y: points.backPocketLeft.y + }); + macro("hd", { + from: points.bWaistSide, + to: points.backPocketRight, + y: points.backPocketRight.y + }); + } + */ + } + + // keep this secret for now: + part.render = false; + + return part; +} diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js new file mode 100755 index 00000000000..cceb59f4c41 --- /dev/null +++ b/packages/waralee/src/pants.js @@ -0,0 +1,148 @@ +import { CreateCrotchPoints } from "./util"; + +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let seatDepth = + measurements.seatDepth + measurements.seatDepth * options.waistRaise; + let circumference = measurements.seatCircumference; + let circumference4 = circumference / 4; + + + paths.waistFoldBack = paths.waistBack + .offset(-1 * options.waistBand) + .attr("class", "fabric stroke-sm"); + paths.waistFoldFront = paths.waistFront + .offset(-1 * options.waistBand) + .attr("class", "fabric stroke-sm"); + + paths.frontFold = paths.front + .offset(-1 * options.hem) + .attr("class", "fabric stroke-sm"); + paths.legFold = paths.leg + .offset(-1 * options.hem) + .attr("class", "fabric stroke-sm"); + paths.backFold = paths.back + .offset(-1 * options.hem) + .attr("class", "fabric stroke-sm"); + + + + // Complete? + if (complete) { + points.logo = points.fWaistFront.shift(270, 400); + snippets.logo = new Snippet("logo", points.logo); + points.text = points.logo + .shift(-90, 50) + .attr("data-text", "hello") + .attr("data-text-class", "center"); + + if (sa) { + paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); + } + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.fWaistSide, + to: points.mWaist, + y: points.fWaistSide.y + }); + macro("hd", { + from: points.fWaistFrontOverlap, + to: points.mWaist, + y: points.fWaistSide.y - sa - 15 + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistSide, + y: points.bWaistSide.y + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistBack, + y: points.bWaistSide.y - sa - 15 + }); + macro("hd", { + from: points.mWaist, + to: points.bWaistBackOverlap, + y: points.bWaistSide.y - sa - 30 + }); + macro("vd", { + from: points.mWaist, + to: points.mHip, + x: points.mWaist.x + }); + macro("vd", { + from: points.bWaistSide, + to: points.bWaistBack, + x: points.bWaistSide.x + 15 + }); + macro("vd", { + from: points.bWaistBackOverlap, + to: points.bLegBackOverlap, + x: points.bLegBackOverlap.x - 30 + }); + + if (options.frontPocket) { + macro("vd", { + from: points.fWaistSide, + to: points.frontPocketTop, + x: points.frontPocketTop.x + }); + macro("vd", { + from: points.fWaistSide, + to: points.frontPocketBottom, + x: points.frontPocketBottom.x + }); + macro("hd", { + from: points.frontPocketTop, + to: points.fWaistSide, + y: points.frontPocketTop.y + }); + macro("hd", { + from: points.frontPocketBottom, + to: points.fWaistSide, + y: points.frontPocketBottom.y + }); + } + if (options.backPocket) { + macro("vd", { + from: points.bWaistSide, + to: points.backPocketLeft, + x: points.backPocketLeft.x + }); + macro("vd", { + from: points.bWaistSide, + to: points.backPocketRight, + x: points.backPocketRight.x + }); + macro("hd", { + from: points.bWaistSide, + to: points.backPocketLeft, + y: points.backPocketLeft.y + }); + macro("hd", { + from: points.bWaistSide, + to: points.backPocketRight, + y: points.backPocketRight.y + }); + } + } + + return part; +} diff --git a/packages/waralee/src/pantsproto.js b/packages/waralee/src/pantsproto.js new file mode 100755 index 00000000000..dd9ac5d4d98 --- /dev/null +++ b/packages/waralee/src/pantsproto.js @@ -0,0 +1,189 @@ +import { CreateCrotchPoints } from "./util"; + +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let seatDepth = + measurements.seatDepth + measurements.seatDepth * options.waistRaise; + let circumference = measurements.seatCircumference; + let circumference4 = circumference / 4; + + points.mWaist = new Point(0, 0); + + CreateCrotchPoints(part); + + points.mLeg = points.mHip.shift(270, measurements.inseam); + points.fLegSide = points.mLeg.shift( + 180, + options.crotchFront * circumference4 + ); + points.bLegSide = points.mLeg.shift(0, options.crotchBack * circumference4); + + points.fWaistFront = points.fWaistSide.shift(180, circumference4); + points.fWaistFrontOverlap = points.fWaistFront.shift( + 180, + options.waistOverlap * circumference4 + ); + points.fHipFront = points.fHipSide.shift(180, circumference4); + points.fHipFrontOverlap = points.fHipFront.shift( + 180, + options.waistOverlap * circumference4 + ); + points.fLegFront = points.fLegSide.shift(180, circumference4); + points.fLegFrontOverlap = points.fLegFront.shift( + 180, + options.waistOverlap * circumference4 + ); + + // Calculate the distance we need to move horizontally to get to the point that will + // diagonally be the distance we're looking for (circumference/4) + let bHorDistance = Math.sqrt( + circumference4 * circumference4 - + options.backRaise * seatDepth * options.backRaise * seatDepth + ); + // Create a point that is this distance from the side. + points.bWaistBack = points.mWaist + .shift(90, options.waistBand) + .shift(0, options.crotchBack * circumference4 + bHorDistance); + + points.bWaistBackOverlap = points.bWaistBack.shift( + 0, + options.waistOverlap * circumference4 + ); + + points.bHipBack = points.bHipSide.shift(0, circumference4); + points.bHipBackOverlap = points.bHipBack.shift( + 0, + options.waistOverlap * circumference4 + ); + points.bLegBack = points.bLegSide.shift(0, circumference4); + points.bLegBackOverlap = points.bLegBack.shift( + 0, + options.waistOverlap * circumference4 + ); + + points.bWaistSideTemp = points.bWaistSide.shift(0, 2); // This is a trick to make the offset() call work. Without it, the offset is crossing the cutout line. + paths.waistBack = new Path() + .move(points.bWaistBackOverlap) + .line(points.bWaistBack) + .line(points.bWaistSideTemp) // This is a trick to make the offset() call work. Without it, the offset is crossing the cutout line. + .line(points.bWaistSide) + .setRender( false ); + paths.waistFront = new Path() + .move(points.fWaistSide) + .line(points.fWaistFront) + .line(points.fWaistFrontOverlap) + .setRender( false ); + paths.front = new Path() + .move(points.fWaistFrontOverlap) + .line(points.fHipFrontOverlap) + .line(points.fLegFrontOverlap) + .setRender( false ); + paths.back = new Path() + .move(points.bLegBackOverlap) + .line(points.bHipBackOverlap) + .line(points.bWaistBackOverlap) + .setRender( false ); + paths.leg = new Path() + .move(points.fLegFrontOverlap) + .line(points.bLegBackOverlap) + .setRender( false ); + paths.cutout = new Path() + .move(points.bWaistSide) + .curve(points.bWaistCrotchCP, points.bHipCrotchCP, points.mHip) + .curve(points.fHipCrotchCP, points.fWaistCrotchCP, points.fWaistSide) + .setRender( false ); + + paths.seam = paths.waistFront + .join(paths.front) + .join(paths.leg) + .join(paths.back) + .join(paths.waistBack) + .join(paths.cutout) + .close() + .attr("class", "fabric"); + if (options.frontPocket) { + points.frontPocketTop = points.fWaistSide + .shift( + 270, + options.frontPocketVerticalOffset * measurements.seatDepth + + options.waistBand * 2 + ) + .shift( + 180, + options.frontPocketHorizontalOffset * measurements.seatCircumference + ); + + points.frontPocketTop2 = points.frontPocketTop.shift(340, 12); + points.frontPocketBottom = points.frontPocketTop.shift( + 250, + options.frontPocketSize * measurements.seatDepth + ); + points.frontPocketBottom2 = points.frontPocketBottom.shift(340, 12); + + paths.frontPocket = new Path() + .move(points.frontPocketTop) + .line(points.frontPocketBottom) + .line(points.frontPocketBottom2) + .line(points.frontPocketTop2) + .close() + .attr("class", "fabric"); + } + + if (options.backPocket) { + points.backPocketRight = points.bWaistBack + .shiftTowards( + points.bWaistSide, + options.backPocketHorizontalOffset * measurements.seatCircumference + ) + .shift( + 270, + options.backPocketVerticalOffset * measurements.seatDepth + + options.waistBand * 2 + ); + points.backPocketLeft = points.bWaistBack + .shiftTowards( + points.bWaistSide, + options.backPocketHorizontalOffset * measurements.seatCircumference + + options.backPocketSize * measurements.seatDepth + ) + .shift( + 270, + options.backPocketVerticalOffset * measurements.seatDepth + + options.waistBand * 2 + ); + points.backPocketRight2 = points.backPocketRight.shift( + points.backPocketRight.angle(points.backPocketLeft) + 90, + 12 + ); + points.backPocketLeft2 = points.backPocketLeft.shift( + points.backPocketLeft.angle(points.backPocketRight) - 90, + 12 + ); + + paths.backPocket = new Path() + .move(points.backPocketLeft) + .line(points.backPocketLeft2) + .line(points.backPocketRight2) + .line(points.backPocketRight) + .close() + .attr("class", "fabric"); + } + + part.render = false; + + return part; +} diff --git a/packages/waralee/src/pocket.js b/packages/waralee/src/pocket.js new file mode 100755 index 00000000000..fddf294ff44 --- /dev/null +++ b/packages/waralee/src/pocket.js @@ -0,0 +1,98 @@ +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let pocketDepth = measurements.seatDepth * options.frontPocketDepthFactor; + + points.topLeft = new Point(0, 0); + points.bottomLeft = points.topLeft.shift(270, pocketDepth); + + points.topRight = points.topLeft.shift(0, pocketDepth * (1 / 3)); + points.bottomRight = points.topRight.shift(290, pocketDepth *(5/6)); + + points.bottomLeftCP = points.bottomLeft.shift(0, pocketDepth * (1 / 6)); + points.bottomRightCP = points.bottomRight.shift(225, pocketDepth * (1 / 4)); + + paths.seam = new Path() + .move(points.topLeft) + .line(points.bottomLeft) + .curve(points.bottomLeftCP, points.bottomRightCP, points.bottomRight) + .line(points.topRight) + .line(points.topLeft) + .close() + .attr("class", "fabric"); + + // Complete? + if (complete) { + macro("cutonfold", { + from: points.topLeft, + to: points.bottomLeft, + margin: 5, + offset: 10 + }); + points.title = points.topLeft.shift(270, 75).shift(0, 50); + macro("title", { + at: points.title, + title: "1x " + "cutOnFold" + " " + "fromFabric" + }); + + points.logo = points.title.shift(270, 75); + snippets.logo = new Snippet("logo", points.logo); + points.text = points.logo + .shift(-90, 25) + .attr("data-text", "Waralee") + .attr("data-text-class", "center"); + + if (sa) { + paths.sa = new Path() + .move(points.bottomLeft) + .join( new Path() + .move(points.bottomLeft) + .curve(points.bottomLeftCP, points.bottomRightCP, points.bottomRight) + .line(points.topRight) + .line(points.topLeft) + .offset(sa) + ) + .line(points.topLeft) + .attr("class", "fabric sa"); + } + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.topLeft, + to: points.topRight, + y: points.topLeft.y + 15 + }); + macro("hd", { + from: points.bottomLeft, + to: points.bottomRight, + y: points.bottomRight.y + }); + macro("vd", { + from: points.topLeft, + to: points.bottomLeft, + x: points.topLeft.x + 15 + }); + macro("vd", { + from: points.topRight, + to: points.bottomRight, + x: points.bottomRight.x + }); + } + + return part; +} diff --git a/packages/waralee/src/util.js b/packages/waralee/src/util.js new file mode 100755 index 00000000000..54418e0cb76 --- /dev/null +++ b/packages/waralee/src/util.js @@ -0,0 +1,35 @@ +function CreateCrotchPoints(part) { + let { options, measurements, points } = part.shorthand(); + + let seatDepth = measurements.seatDepth + (measurements.seatDepth *options.waistRaise ); + let circumference = measurements.seatCircumference; + let circumference4 = circumference / 4; + + points.mHip = points.mWaist.shift(270, seatDepth); + + points.fWaistSide = points.mWaist + .shift(180, options.crotchFront * circumference4) + .shift( 90, options.waistBand ); + points.fWaistCrotchCP = points.fWaistSide.shift( + 270, + seatDepth * options.crotchFactorFrontVer +options.waistBand + ); + points.fHipCrotchCP = points.mHip + .shift(180,options.crotchFront * circumference4 * options.crotchFactorFrontHor); + + points.fHipSide = points.mHip + .shift(180, options.crotchFront * circumference4 ); + + points.bWaistSide = points.mWaist + .shift( 0, options.crotchBack * circumference4) + .shift(90, options.waistBand ) + .shift(90, options.backRaise * seatDepth); + points.bWaistCrotchCP = points.bWaistSide + .shift(270, seatDepth * options.crotchFactorBackVer ); + points.bHipCrotchCP = points.mHip + .shift(0,options.crotchBack * circumference4 * options.crotchFactorBackHor); + + points.bHipSide = points.mHip.shift(0, options.crotchBack * circumference4 ); +} + +export { CreateCrotchPoints }; From bf3e12ba4fe431e4a57d6fdc21a5a3cbfb29f503 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Wed, 21 Aug 2019 09:07:39 -0700 Subject: [PATCH 2/6] Add Waralee --- packages/waralee/config/index.js | 3 +-- packages/waralee/src/index.js | 4 ++-- packages/waralee/src/pants.js | 7 ------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js index db68b75ce87..7658459ccab 100755 --- a/packages/waralee/config/index.js +++ b/packages/waralee/config/index.js @@ -42,8 +42,7 @@ export default { "seatDepth" ], dependencies: {}, - inject: {pants:"pantsproto", - mini:"pantsproto"}, + inject: {pants:"pantsproto"/*,mini:"pantsproto"*/}, hide: [], parts: ["cutout", "pocket", "facings"], options: { diff --git a/packages/waralee/src/index.js b/packages/waralee/src/index.js index 20d6bcfbc11..a7719ebb6e2 100755 --- a/packages/waralee/src/index.js +++ b/packages/waralee/src/index.js @@ -6,7 +6,7 @@ import draftPants from "./pants"; import draftCutout from "./cutout"; import draftPocket from "./pocket"; import draftFacings from "./facings"; -import draftMini from "./mini"; +//import draftMini from "./mini"; // Create new design const Pattern = new freesewing.Design(config, plugins); @@ -17,6 +17,6 @@ Pattern.prototype.draftPants = draftPants; Pattern.prototype.draftCutout = draftCutout; Pattern.prototype.draftPocket = draftPocket; Pattern.prototype.draftFacings = draftFacings; -Pattern.prototype.draftMini = draftMini; +//Pattern.prototype.draftMini = draftMini; export default Pattern; diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js index cceb59f4c41..2a9ac1f6021 100755 --- a/packages/waralee/src/pants.js +++ b/packages/waralee/src/pants.js @@ -1,5 +1,3 @@ -import { CreateCrotchPoints } from "./util"; - export default function(part) { let { options, @@ -16,11 +14,6 @@ export default function(part) { macro } = part.shorthand(); - let seatDepth = - measurements.seatDepth + measurements.seatDepth * options.waistRaise; - let circumference = measurements.seatCircumference; - let circumference4 = circumference / 4; - paths.waistFoldBack = paths.waistBack .offset(-1 * options.waistBand) From 81e31eef6715d80006d1d379c380ffda86a17bf5 Mon Sep 17 00:00:00 2001 From: WV Admin Date: Wed, 21 Aug 2019 09:26:48 -0700 Subject: [PATCH 3/6] adding waralee --- .gitignore | 6 ++++++ packages/create-freesewing-pattern/index.js | 0 packages/create-freesewing-pattern/lib/cli.js | 0 packages/i18n/sort.sh | 0 packages/waralee/README.md | 0 packages/waralee/config/index.js | 2 +- packages/waralee/example/.babelrc | 0 packages/waralee/example/README.md | 0 packages/waralee/example/package.json | 0 packages/waralee/example/public/favicon.ico | Bin packages/waralee/example/public/index.html | 0 packages/waralee/example/public/manifest.json | 0 packages/waralee/example/src/App.js | 0 packages/waralee/example/src/App.test.js | 0 packages/waralee/example/src/index.js | 0 packages/waralee/example/src/serviceWorker.js | 0 packages/waralee/package.json | 0 packages/waralee/rollup.config.js | 0 packages/waralee/src/.eslintrc | 0 packages/waralee/src/cutout.js | 2 -- packages/waralee/src/facings.js | 4 ++-- packages/waralee/src/index.js | 0 packages/waralee/src/mini.js | 4 ++-- packages/waralee/src/pants.js | 4 ++-- packages/waralee/src/pantsproto.js | 4 ++-- packages/waralee/src/pocket.js | 0 packages/waralee/src/util.js | 0 scripts/taskrunner.sh | 0 scripts/verdaccio.sh | 0 29 files changed, 15 insertions(+), 11 deletions(-) mode change 100755 => 100644 packages/create-freesewing-pattern/index.js mode change 100755 => 100644 packages/create-freesewing-pattern/lib/cli.js mode change 100755 => 100644 packages/i18n/sort.sh mode change 100755 => 100644 packages/waralee/README.md mode change 100755 => 100644 packages/waralee/config/index.js mode change 100755 => 100644 packages/waralee/example/.babelrc mode change 100755 => 100644 packages/waralee/example/README.md mode change 100755 => 100644 packages/waralee/example/package.json mode change 100755 => 100644 packages/waralee/example/public/favicon.ico mode change 100755 => 100644 packages/waralee/example/public/index.html mode change 100755 => 100644 packages/waralee/example/public/manifest.json mode change 100755 => 100644 packages/waralee/example/src/App.js mode change 100755 => 100644 packages/waralee/example/src/App.test.js mode change 100755 => 100644 packages/waralee/example/src/index.js mode change 100755 => 100644 packages/waralee/example/src/serviceWorker.js mode change 100755 => 100644 packages/waralee/package.json mode change 100755 => 100644 packages/waralee/rollup.config.js mode change 100755 => 100644 packages/waralee/src/.eslintrc mode change 100755 => 100644 packages/waralee/src/cutout.js mode change 100755 => 100644 packages/waralee/src/facings.js mode change 100755 => 100644 packages/waralee/src/index.js mode change 100755 => 100644 packages/waralee/src/mini.js mode change 100755 => 100644 packages/waralee/src/pants.js mode change 100755 => 100644 packages/waralee/src/pantsproto.js mode change 100755 => 100644 packages/waralee/src/pocket.js mode change 100755 => 100644 packages/waralee/src/util.js mode change 100755 => 100644 scripts/taskrunner.sh mode change 100755 => 100644 scripts/verdaccio.sh diff --git a/.gitignore b/.gitignore index 546d8244ba7..a0c924af46d 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,9 @@ yarn-debug.log* yarn-error.log* lerna-debug.log* packages/core/.nyc_output +packages/i18n/sort.sh +packages/create-freesewing-pattern/index.js +packages/create-freesewing-pattern/lib/cli.js +.gitignore +scripts/taskrunner.sh +scripts/verdaccio.sh diff --git a/packages/create-freesewing-pattern/index.js b/packages/create-freesewing-pattern/index.js old mode 100755 new mode 100644 diff --git a/packages/create-freesewing-pattern/lib/cli.js b/packages/create-freesewing-pattern/lib/cli.js old mode 100755 new mode 100644 diff --git a/packages/i18n/sort.sh b/packages/i18n/sort.sh old mode 100755 new mode 100644 diff --git a/packages/waralee/README.md b/packages/waralee/README.md old mode 100755 new mode 100644 diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js old mode 100755 new mode 100644 index 7658459ccab..63a70ea6e47 --- a/packages/waralee/config/index.js +++ b/packages/waralee/config/index.js @@ -1,4 +1,4 @@ -import { version } from "../package.json"; +//import { version } from "../package.json"; // ?? 🤔 ?? --> https://en.freesewing.dev/packages/core/config diff --git a/packages/waralee/example/.babelrc b/packages/waralee/example/.babelrc old mode 100755 new mode 100644 diff --git a/packages/waralee/example/README.md b/packages/waralee/example/README.md old mode 100755 new mode 100644 diff --git a/packages/waralee/example/package.json b/packages/waralee/example/package.json old mode 100755 new mode 100644 diff --git a/packages/waralee/example/public/favicon.ico b/packages/waralee/example/public/favicon.ico old mode 100755 new mode 100644 diff --git a/packages/waralee/example/public/index.html b/packages/waralee/example/public/index.html old mode 100755 new mode 100644 diff --git a/packages/waralee/example/public/manifest.json b/packages/waralee/example/public/manifest.json old mode 100755 new mode 100644 diff --git a/packages/waralee/example/src/App.js b/packages/waralee/example/src/App.js old mode 100755 new mode 100644 diff --git a/packages/waralee/example/src/App.test.js b/packages/waralee/example/src/App.test.js old mode 100755 new mode 100644 diff --git a/packages/waralee/example/src/index.js b/packages/waralee/example/src/index.js old mode 100755 new mode 100644 diff --git a/packages/waralee/example/src/serviceWorker.js b/packages/waralee/example/src/serviceWorker.js old mode 100755 new mode 100644 diff --git a/packages/waralee/package.json b/packages/waralee/package.json old mode 100755 new mode 100644 diff --git a/packages/waralee/rollup.config.js b/packages/waralee/rollup.config.js old mode 100755 new mode 100644 diff --git a/packages/waralee/src/.eslintrc b/packages/waralee/src/.eslintrc old mode 100755 new mode 100644 diff --git a/packages/waralee/src/cutout.js b/packages/waralee/src/cutout.js old mode 100755 new mode 100644 index 80ece1e99e3..6a79c7a8d9d --- a/packages/waralee/src/cutout.js +++ b/packages/waralee/src/cutout.js @@ -17,8 +17,6 @@ export default function(part) { } = part.shorthand(); let seatDepth = measurements.seatDepth + (measurements.seatDepth *options.waistRaise ); - let circumference = measurements.seatCircumference; - let circumference4 = circumference / 4; points.mWaist = new Point(0, 0); points.mHip = points.mWaist.shift(270, seatDepth); diff --git a/packages/waralee/src/facings.js b/packages/waralee/src/facings.js old mode 100755 new mode 100644 index 2da2167819e..19c58141d63 --- a/packages/waralee/src/facings.js +++ b/packages/waralee/src/facings.js @@ -6,10 +6,10 @@ export default function(part) { Path, points, paths, - Snippet, + /*Snippet,*/ snippets, complete, - sa, + /*sa,*/ paperless, macro } = part.shorthand(); diff --git a/packages/waralee/src/index.js b/packages/waralee/src/index.js old mode 100755 new mode 100644 diff --git a/packages/waralee/src/mini.js b/packages/waralee/src/mini.js old mode 100755 new mode 100644 index 92647aa91ec..49f8e48f3a6 --- a/packages/waralee/src/mini.js +++ b/packages/waralee/src/mini.js @@ -5,9 +5,9 @@ export default function(part) { let { options, - measurements, + /*measurements, Point, - Path, + Path,*/ points, paths, Snippet, diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js old mode 100755 new mode 100644 index 2a9ac1f6021..29d4ae104d1 --- a/packages/waralee/src/pants.js +++ b/packages/waralee/src/pants.js @@ -1,9 +1,9 @@ export default function(part) { let { options, - measurements, + /*measurements, Point, - Path, + Path,*/ points, paths, Snippet, diff --git a/packages/waralee/src/pantsproto.js b/packages/waralee/src/pantsproto.js old mode 100755 new mode 100644 index dd9ac5d4d98..b9ed0dc1feb --- a/packages/waralee/src/pantsproto.js +++ b/packages/waralee/src/pantsproto.js @@ -7,13 +7,13 @@ export default function(part) { Point, Path, points, - paths, + paths/*, Snippet, snippets, complete, sa, paperless, - macro + macro*/ } = part.shorthand(); let seatDepth = diff --git a/packages/waralee/src/pocket.js b/packages/waralee/src/pocket.js old mode 100755 new mode 100644 diff --git a/packages/waralee/src/util.js b/packages/waralee/src/util.js old mode 100755 new mode 100644 diff --git a/scripts/taskrunner.sh b/scripts/taskrunner.sh old mode 100755 new mode 100644 diff --git a/scripts/verdaccio.sh b/scripts/verdaccio.sh old mode 100755 new mode 100644 From 79fc2335a6db840509eded52d73932b9eaa766b2 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Mon, 16 Sep 2019 11:47:51 -0700 Subject: [PATCH 4/6] Added back pocket --- packages/waralee/config/index.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js index 63a70ea6e47..a2954a9f99e 100644 --- a/packages/waralee/config/index.js +++ b/packages/waralee/config/index.js @@ -1,4 +1,4 @@ -//import { version } from "../package.json"; +import { version } from "../package.json"; // ?? 🤔 ?? --> https://en.freesewing.dev/packages/core/config @@ -22,17 +22,15 @@ export default { "sewing pattern" ], optionGroups: { - fit: [ - "waistRaise", - "legShortening", - "waistOverlap", + fit: ["legShortening", "waistOverlap", "backRaise"], + advanced: [ "crotchFront", "crotchBack", "crotchFactorBackHor", "crotchFactorBackVer", "crotchFactorFrontHor", "crotchFactorFrontVer", - "backRaise" + "waistRaise" ] }, measurements: [ @@ -42,9 +40,9 @@ export default { "seatDepth" ], dependencies: {}, - inject: {pants:"pantsproto"/*,mini:"pantsproto"*/}, + inject: { pants: "pantsproto", mini: "pantsproto" }, hide: [], - parts: ["cutout", "pocket", "facings"], + parts: ["cutout", "pocket", "backPocket", "facings"], options: { minimizer: 5, frontPocketVerticalOffset: 0.07, @@ -52,12 +50,13 @@ export default { frontPocketSize: 0.65, frontPocket: { bool: true }, frontPocketDepthFactor: 1.6, + backPocketDepth: 140, backPocketVerticalOffset: 0.15, backPocketHorizontalOffset: 0.045, backPocketSize: 0.65, backPocket: { bool: true }, - hem: {mm: 15, min: 0, max: 100}, - waistBand: {mm: 25, min: 0, max: 100}, + hem: { mm: 15, min: 0, max: 100 }, + waistBand: { mm: 25, min: 0, max: 100 }, waistRaise: { pct: 20, min: 0, max: 40 }, crotchBack: { pct: 45, min: 10, max: 70 }, crotchFront: { pct: 30, min: 10, max: 70 }, @@ -66,7 +65,7 @@ export default { crotchFactorBackHor: { pct: 90, min: 10, max: 100 }, crotchFactorBackVer: { pct: 60, min: 20, max: 90 }, waistOverlap: { pct: 50, min: 10, max: 100 }, - legShortening: { pct: 25, min: 0, max: 50 }, + legShortening: { pct: 25, min: -10, max: 50 }, backRaise: { pct: 10, min: 0, max: 25 } } }; From 0f538d8d2ede502e979f08aa607d0adcb820facc Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Mon, 16 Sep 2019 11:48:40 -0700 Subject: [PATCH 5/6] Added back pocket --- packages/waralee/src/backpocket.js | 76 ++++++++++++++++++++++++++++++ packages/waralee/src/facings.js | 8 ++-- packages/waralee/src/index.js | 6 ++- packages/waralee/src/pants.js | 15 ++++-- packages/waralee/src/pantsproto.js | 6 +-- packages/waralee/src/pocket.js | 5 ++ 6 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 packages/waralee/src/backpocket.js diff --git a/packages/waralee/src/backpocket.js b/packages/waralee/src/backpocket.js new file mode 100644 index 00000000000..5a07a01bc30 --- /dev/null +++ b/packages/waralee/src/backpocket.js @@ -0,0 +1,76 @@ +export default function(part) { + let { + options, + measurements, + Point, + Path, + points, + paths, + Snippet, + snippets, + complete, + sa, + paperless, + macro + } = part.shorthand(); + + let pocketDepth = options.backPocketDepth; + + points.topLeft = new Point(0, 0); + points.bottomLeft = points.topLeft.shift( + 270, + (pocketDepth + 30) * 2 + + options.backPocketVerticalOffset * measurements.seatDepth + ); + + points.topRight = points.topLeft.shift( + 0, + options.backPocketSize * measurements.seatDepth + 24 + ); + points.bottomRight = points.topRight.shift( + 270, + (pocketDepth + 30) * 2 + + options.backPocketVerticalOffset * measurements.seatDepth + ); + + paths.seam = new Path() + .move(points.topLeft) + .line(points.bottomLeft) + .line(points.bottomRight) + .line(points.topRight) + .line(points.topLeft) + .close() + .attr("class", "fabric"); + + // Complete? + if (complete) { + points.title = points.topLeft.shift(270, 75).shift(0, 50); + macro("title", { + at: points.title, + title: "2x " + "fromFabric" + }); + + points.logo = points.title.shift(270, 75); + snippets.logo = new Snippet("logo", points.logo); + points.text = points.logo + .shift(-90, 25) + .attr("data-text", "Waralee") + .attr("data-text-class", "center"); + } + + // Paperless? + if (paperless) { + macro("hd", { + from: points.topLeft, + to: points.topRight, + y: points.topLeft.y + 15 + }); + macro("vd", { + from: points.topLeft, + to: points.bottomLeft, + x: points.topLeft.x + 15 + }); + } + + return part; +} diff --git a/packages/waralee/src/facings.js b/packages/waralee/src/facings.js index 19c58141d63..5276a81daf8 100644 --- a/packages/waralee/src/facings.js +++ b/packages/waralee/src/facings.js @@ -6,10 +6,10 @@ export default function(part) { Path, points, paths, - /*Snippet,*/ + Snippet, snippets, complete, - /*sa,*/ + sa, paperless, macro } = part.shorthand(); @@ -49,7 +49,7 @@ export default function(part) { points.frontTitle = points.frontTL.shift(270, 15).shift(0, 50); macro("title", { at: points.frontTitle.shift(0,30), - title: "1x fromFabric" + title: "4x fromFabric" }); points.frontLogo = points.frontTitle.shift(270, 15); snippets.frontLogo = new Snippet("logo", points.frontLogo).attr("data-scale", 0.4); @@ -61,7 +61,7 @@ export default function(part) { points.backTitle = points.backTL.shift(270, 15).shift(0, 50); macro("title", { at: points.backTitle.shift(0,30), - title: "1x fromFabric" + title: "4x fromFabric" }); points.backLogo = points.backTitle.shift(270, 15); snippets.backLogo = new Snippet("logo", points.backLogo).attr("data-scale", 0.4); diff --git a/packages/waralee/src/index.js b/packages/waralee/src/index.js index a7719ebb6e2..15af34364a7 100644 --- a/packages/waralee/src/index.js +++ b/packages/waralee/src/index.js @@ -5,8 +5,9 @@ import draftPantsproto from "./pantsproto"; import draftPants from "./pants"; import draftCutout from "./cutout"; import draftPocket from "./pocket"; +import draftBackPocket from "./backpocket"; import draftFacings from "./facings"; -//import draftMini from "./mini"; +import draftMini from "./mini"; // Create new design const Pattern = new freesewing.Design(config, plugins); @@ -16,7 +17,8 @@ Pattern.prototype.draftPantsproto = draftPantsproto; Pattern.prototype.draftPants = draftPants; Pattern.prototype.draftCutout = draftCutout; Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftBackPocket = draftBackPocket; Pattern.prototype.draftFacings = draftFacings; -//Pattern.prototype.draftMini = draftMini; +Pattern.prototype.draftMini = draftMini; export default Pattern; diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js index 29d4ae104d1..162369696e9 100644 --- a/packages/waralee/src/pants.js +++ b/packages/waralee/src/pants.js @@ -1,9 +1,11 @@ +import { CreateCrotchPoints } from "./util"; + export default function(part) { let { options, - /*measurements, + measurements, Point, - Path,*/ + Path, points, paths, Snippet, @@ -14,6 +16,11 @@ export default function(part) { macro } = part.shorthand(); + let seatDepth = + measurements.seatDepth + measurements.seatDepth * options.waistRaise; + let circumference = measurements.seatCircumference; + let circumference4 = circumference / 4; + paths.waistFoldBack = paths.waistBack .offset(-1 * options.waistBand) @@ -133,8 +140,8 @@ export default function(part) { from: points.bWaistSide, to: points.backPocketRight, y: points.backPocketRight.y - }); - } + }); + } } return part; diff --git a/packages/waralee/src/pantsproto.js b/packages/waralee/src/pantsproto.js index b9ed0dc1feb..74a9c8e3b50 100644 --- a/packages/waralee/src/pantsproto.js +++ b/packages/waralee/src/pantsproto.js @@ -7,13 +7,13 @@ export default function(part) { Point, Path, points, - paths/*, + paths, Snippet, snippets, complete, sa, paperless, - macro*/ + macro } = part.shorthand(); let seatDepth = @@ -25,7 +25,7 @@ export default function(part) { CreateCrotchPoints(part); - points.mLeg = points.mHip.shift(270, measurements.inseam); + points.mLeg = points.mHip.shift(270, measurements.inseam * (1 -options.legShortening)); points.fLegSide = points.mLeg.shift( 180, options.crotchFront * circumference4 diff --git a/packages/waralee/src/pocket.js b/packages/waralee/src/pocket.js index fddf294ff44..b104cf87fa9 100644 --- a/packages/waralee/src/pocket.js +++ b/packages/waralee/src/pocket.js @@ -92,6 +92,11 @@ export default function(part) { to: points.bottomRight, x: points.bottomRight.x }); + macro("vd", { + from: points.bottomRight, + to: points.bottomLeft, + x: points.bottomRight.x + }); } return part; From b0470fc4375814271778fe699efa9305ef3ff619 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Mon, 16 Sep 2019 12:10:22 -0700 Subject: [PATCH 6/6] Adding Waralee options --- .../i18n/src/locales/en/options/waralee.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/i18n/src/locales/en/options/waralee.yml diff --git a/packages/i18n/src/locales/en/options/waralee.yml b/packages/i18n/src/locales/en/options/waralee.yml new file mode 100644 index 00000000000..a4c6c3d8c16 --- /dev/null +++ b/packages/i18n/src/locales/en/options/waralee.yml @@ -0,0 +1,48 @@ +hem: + title: Hem size + description: Size of the hem at the bottom of the pants + +waistBand: + title: Waist Band + description: Size of the waist band + +waistRaise: + title: Waist Raise + description: How much to raise the waist from the seat depth measurement. This influences the depth of the crotch cut-out. + +crotchBack: + title: Crotch Back + description: The percentage of the seat circumference that the back crotch needs to occupy. This creates more or less space between the side seam and the back. + +crotchFront: + title: Crotch Front + description: The percentage of the seat circumference that the front crotch needs to occupy. This creates more or less space between the side seam and the front. + +crotchFactorBackHor: + title: Back Crotch Factor Horizontal + description: Used to move the curve of the crotch in the back horizontally + +crotchFactorBackVer: + title: Back Crotch Factor Vertical + description: Used to move the curve of the crotch in the back vertically + +crotchFactorFrontHor: + title: Front Crotch Factor Horizontal + description: Used to move the curve of the crotch in the front horizontally + +crotchFactorFrontVer: + title: Front Crotch Factor Vertical + description: Used to move the curve of the crotch in the front vertically + +waistOverlap: + title: Waist Overlap + description: This dicates how much you want the leg flaps to overlap at the waist. A setting of 0 would have them meet at the side seam, and a setting of 100 makes them meet at the front/back. + +legShortening: + title: Leg Shortening + description: This dictates how long the pants will be. It is a factor of the inseam measurement. The larger the value, the more that will be taken off the length. + +backRaise: + title: Back Raise + description: This setting raises the waist in the back. Our waist does not sit horizontally, but is angled up at the back. This seting allows you to raise this in the back if you need it for a good fit. +