feat: Bella, initial work on another womenswear bodice
This commit is contained in:
parent
d493e30f30
commit
8a7824bc7b
23 changed files with 1197 additions and 0 deletions
32
.github/workflows/tests.bella.yml
vendored
Normal file
32
.github/workflows/tests.bella.yml
vendored
Normal file
|
@ -0,0 +1,32 @@
|
|||
name: Unit tests - Bella
|
||||
|
||||
on: [pull_request]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [12.x]
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
- name: Install dependencies
|
||||
run: cd packages/bella && npm install
|
||||
env:
|
||||
CI: true
|
||||
- name: Install peer & test dependencies
|
||||
run: "cd packages/bella && npm install @freesewing/core@^2.10.2 @freesewing/plugin-bundle@^2.10.2 @freesewing/models@2.10.2 @freesewing/pattern-info@2.10.2 mocha chai"
|
||||
env:
|
||||
CI: true
|
||||
- name: Build pattern
|
||||
run: cd packages/bella && npm run build
|
||||
- name: Run pattern unit tests
|
||||
run: cd packages/bella && npm run testci
|
|
@ -1,5 +1,6 @@
|
|||
aaron: 'A FreeSewing pattern for a A-shirt or tank top'
|
||||
albert: 'A FreeSewing pattern for an apron'
|
||||
bella: 'A FreeSewing pattern for a womenswear bodice block'
|
||||
benjamin: 'A FreeSewing pattern for a bow tie'
|
||||
bent: 'A FreeSewing pattern for a menswear body block with a two-part sleeve'
|
||||
breanna: 'A FreeSewing pattern for a basic body block for womenswear'
|
||||
|
|
9
packages/bella/CHANGELOG.md
Normal file
9
packages/bella/CHANGELOG.md
Normal file
|
@ -0,0 +1,9 @@
|
|||
# Change log for: @freesewing/bella
|
||||
|
||||
|
||||
|
||||
This is the **initial release**, and the start of this change log.
|
||||
|
||||
> Prior to version 2, FreeSewing was not a JavaScript project.
|
||||
> As such, that history is out of scope for this change log.
|
||||
|
100
packages/bella/README.md
Normal file
100
packages/bella/README.md
Normal file
|
@ -0,0 +1,100 @@
|
|||

|
||||
<p align='center'><a
|
||||
href="https://www.npmjs.com/package/@freesewing/bella"
|
||||
title="@freesewing/bella on NPM"
|
||||
><img src="https://img.shields.io/npm/v/@freesewing/bella.svg"
|
||||
alt="@freesewing/bella on NPM"/>
|
||||
</a><a
|
||||
href="https://opensource.org/licenses/MIT"
|
||||
title="License: MIT"
|
||||
><img src="https://img.shields.io/npm/l/@freesewing/bella.svg?label=License"
|
||||
alt="License: MIT"/>
|
||||
</a><a
|
||||
href="https://deepscan.io/dashboard#view=project&tid=2114&pid=2993&bid=23256"
|
||||
title="Code quality on DeepScan"
|
||||
><img src="https://deepscan.io/api/teams/2114/projects/2993/branches/23256/badge/grade.svg"
|
||||
alt="Code quality on DeepScan"/>
|
||||
</a><a
|
||||
href="https://github.com/freesewing/freesewing/issues?q=is%3Aissue+is%3Aopen+label%3Apkg%3Abella"
|
||||
title="Open issues tagged pkg:bella"
|
||||
><img src="https://img.shields.io/github/issues/freesewing/freesewing/pkg:bella.svg?label=Issues"
|
||||
alt="Open issues tagged pkg:bella"/>
|
||||
</a></p><p align='center'><a
|
||||
href="https://twitter.com/freesewing_org"
|
||||
title="Follow @freesewing_org on Twitter"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Follow%20us-blue.svg?logo=twitter&logoColor=white&logoWidth=15"
|
||||
alt="Follow @freesewing_org on Twitter"/>
|
||||
</a><a
|
||||
href="https://chat.freesewing.org"
|
||||
title="Chat with us on Discord"
|
||||
><img src="https://img.shields.io/discord/698854858052075530?label=Chat%20on%20Discord"
|
||||
alt="Chat with us on Discord"/>
|
||||
</a><a
|
||||
href="https://freesewing.org/patrons/join"
|
||||
title="Become a FreeSewing Patron"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Support%20us-blueviolet.svg?logo=cash-app&logoColor=white&logoWidth=15"
|
||||
alt="Become a FreeSewing Patron"/>
|
||||
</a><a
|
||||
href="https://instagram.com/freesewing_org"
|
||||
title="Follow @freesewing_org on Twitter"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Follow%20us-E4405F.svg?logo=instagram&logoColor=white&logoWidth=15"
|
||||
alt="Follow @freesewing_org on Twitter"/>
|
||||
</a></p>
|
||||
|
||||
## What am I looking at? 🤔
|
||||
|
||||
This repository is our *monorepo* holding [all our NPM packages](https://www.npmjs.com/search?q=keywords:freesewing).
|
||||
This folder holds **@freesewing/bella**
|
||||
|
||||
A FreeSewing pattern for a womenswear bodice block
|
||||
|
||||
|
||||
|
||||
## About FreeSewing 💀
|
||||
|
||||
Where the world of makers and developers collide, that's where you'll find FreeSewing.
|
||||
|
||||
Our [core library](https://freesewing.dev/reference/api/) is a *batteries-included* toolbox
|
||||
for parametric design of sewing patterns. It's a modular system (check our list
|
||||
of [plugins](https://freesewing.dev/reference/plugins/) and getting started is as simple as:
|
||||
|
||||
```bash
|
||||
npm init freesewing-pattern
|
||||
```
|
||||
|
||||
The [getting started](https://freesewing.dev/guides/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 reference](https://freesewing.dev/reference/api/),
|
||||
as well as [our turorial](https://freesewing.dev/tutorials/pattern-design/),
|
||||
and [howtos](https://freesewing.dev/howtos/).
|
||||
|
||||
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.dev)
|
||||
- 💬 Chat: On Discord via [chat.freesewing.org](https://chat.freesewing.org/)
|
||||
- 🐦 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 [chatrooms on Discord](https://chat.freesewing.org/) are 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).
|
82
packages/bella/config/index.js
Normal file
82
packages/bella/config/index.js
Normal file
|
@ -0,0 +1,82 @@
|
|||
import { version } from '../package.json'
|
||||
|
||||
export default {
|
||||
name: 'bella',
|
||||
version,
|
||||
design: 'Bella Incognito',
|
||||
code: 'Joost De Cock',
|
||||
department: 'womenswear',
|
||||
type: 'block',
|
||||
difficulty: 3,
|
||||
tags: ['block', 'top', 'basics'],
|
||||
optionGroups: {
|
||||
fit: ['chestEase', 'waistEase'],
|
||||
advanced: [
|
||||
'backNeckCutout',
|
||||
'backHemSlope',
|
||||
'backDartHeight',
|
||||
'armholeDepth',
|
||||
'backArmholeSlant',
|
||||
'backArmholeCurvature',
|
||||
'frontShoulderWidth',
|
||||
'frontArmholePitchDepth',
|
||||
'backArmholePitchDepth',
|
||||
'highBustWidth'
|
||||
]
|
||||
},
|
||||
measurements: [
|
||||
'highBust',
|
||||
'chest',
|
||||
'underbust',
|
||||
'waist',
|
||||
'waistBack',
|
||||
//'waistToHips',
|
||||
//'hips',
|
||||
'bustSpan',
|
||||
'neck',
|
||||
'hpsToBust',
|
||||
'hpsToWaistFront',
|
||||
'hpsToWaistBack',
|
||||
'shoulderToShoulder',
|
||||
'shoulderSlope'
|
||||
// FIXME: Measurement from waist up to armhole (for sleeveless)
|
||||
],
|
||||
dependencies: {
|
||||
back: 'frontSideDart'
|
||||
},
|
||||
inject: {},
|
||||
hide: [],
|
||||
parts: [
|
||||
'back',
|
||||
'frontSideDart'
|
||||
// 'frontShoulderDart'
|
||||
],
|
||||
options: {
|
||||
// Constants
|
||||
acrossBackFactor: 0.925,
|
||||
shoulderSlopeBack: 1.23,
|
||||
neckWidthBack: 0.197,
|
||||
neckWidthFront: 0.17,
|
||||
shoulderToShoulderCorrection: 0.995,
|
||||
backDartLocation: 0.145,
|
||||
backCenterWaistReduction: 0.35,
|
||||
collarFactor: 0.19,
|
||||
|
||||
// Percentages
|
||||
backNeckCutout: { pct: 6, min: 3, max: 9 },
|
||||
waistEase: { pct: 5, min: 1, max: 9 },
|
||||
chestEase: { pct: 11, min: 5, max: 20 },
|
||||
backDartHeight: { pct: 46, min: 38, max: 54 },
|
||||
armholeDepth: { pct: 44, min: 38, max: 50 },
|
||||
backHemSlope: { deg: 2.5, min: 0, max: 5 },
|
||||
backArmholeSlant: { deg: 5, min: 2, max: 8 },
|
||||
backArmholeCurvature: { pct: 63, min: 50, max: 85 },
|
||||
frontArmholeCurvature: { pct: 63, min: 50, max: 85 },
|
||||
fullChestEaseReduction: { pct: 4, min: 0, max: 8 },
|
||||
frontShoulderWidth: { pct: 95, max: 98, min: 92 },
|
||||
frontArmholePitchDepth: { pct: 29, max: 35, min: 24 },
|
||||
backArmholePitchDepth: { pct: 35, max: 40, min: 30 },
|
||||
highBustWidth: { pct: 86, max: 92, min: 80 },
|
||||
bustDartLength: { pct: 92, min: 85, max: 98 }
|
||||
}
|
||||
}
|
13
packages/bella/example/.babelrc
Normal file
13
packages/bella/example/.babelrc
Normal file
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"plugins": [
|
||||
[
|
||||
"prismjs",
|
||||
{
|
||||
"languages": ["javascript", "css", "markup"],
|
||||
"plugins": ["line-numbers"],
|
||||
"theme": "twilight",
|
||||
"css": true
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
96
packages/bella/example/README.md
Normal file
96
packages/bella/example/README.md
Normal file
|
@ -0,0 +1,96 @@
|
|||
<p align="center">
|
||||
<a title="Go to freesewing.org" href="https://freesewing.org/"><img src="https://freesewing.org/img/logo/black.svg" align="center" width="150px" alt="Freesewing logo"/></a>
|
||||
<br>
|
||||
<a href="https://freesewing.org/">FreeSewing v2</a>
|
||||
</p>
|
||||
<p align="center">A JavaScript library for made-to-measure sewing patterns</p>
|
||||
<p align='center'><a
|
||||
href="https://twitter.com/freesewing_org"
|
||||
title="Follow @freesewing_org on Twitter"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Follow%20us-blue.svg?logo=twitter&logoColor=white&logoWidth=15"
|
||||
alt="Follow @freesewing_org on Twitter"/>
|
||||
</a><a
|
||||
href="https://gitter.im/freesewing/freesewing"
|
||||
title="Chat with us on Gitter"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Chat%20with%20us-CA0547.svg?logo=gitter&logoColor=white&logoWidth=15"
|
||||
alt="Chat with us on Gitter"/>
|
||||
</a><a
|
||||
href="https://freesewing.org/patrons/join"
|
||||
title="Become a FreeSewing Patron"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Support%20us-blueviolet.svg?logo=cash-app&logoColor=white&logoWidth=15"
|
||||
alt="Become a FreeSewing Patron"/>
|
||||
</a><a
|
||||
href="https://instagram.com/freesewing_org"
|
||||
title="Follow @freesewing_org on Twitter"
|
||||
><img src="https://img.shields.io/badge/%F3%A0%80%A0-Follow%20us-E4405F.svg?logo=instagram&logoColor=white&logoWidth=15"
|
||||
alt="Follow @freesewing_org on Twitter"/>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
# bella 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://bella.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).
|
||||
|
9
packages/bella/example/netlify.toml
Normal file
9
packages/bella/example/netlify.toml
Normal file
|
@ -0,0 +1,9 @@
|
|||
[build]
|
||||
base = "packages/bella/example"
|
||||
publish = "build"
|
||||
command = "npm run build"
|
||||
|
||||
[[redirects]]
|
||||
from = "/*"
|
||||
to = "/index.html"
|
||||
status = 200
|
50
packages/bella/example/package.json
Normal file
50
packages/bella/example/package.json
Normal file
|
@ -0,0 +1,50 @@
|
|||
{
|
||||
"name": "bella",
|
||||
"homepage": "https://bella.freesewing.dev/",
|
||||
"version": "2.10.2",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@freesewing/components": "latest",
|
||||
"@freesewing/core": "latest",
|
||||
"@freesewing/css-theme": "latest",
|
||||
"@freesewing/i18n": "latest",
|
||||
"@freesewing/models": "latest",
|
||||
"@freesewing/mui-theme": "latest",
|
||||
"@freesewing/pattern-info": "latest",
|
||||
"@freesewing/plugin-bundle": "latest",
|
||||
"@freesewing/plugin-theme": "latest",
|
||||
"@freesewing/plugin-i18n": "latest",
|
||||
"@freesewing/plugin-svgattr": "latest",
|
||||
"@freesewing/utils": "latest",
|
||||
"@material-ui/core": "^4.11.0",
|
||||
"@material-ui/icons": "^4.9.1",
|
||||
"@material-ui/lab": "^v4.0.0-alpha.56",
|
||||
"pattern": "link:..",
|
||||
"prismjs": "1.22.0",
|
||||
"react": "^16.13",
|
||||
"react-dom": "^16.13",
|
||||
"react-scripts": "^3.4.1",
|
||||
"file-saver": "^2.0.2",
|
||||
"react-markdown": "4.3.1",
|
||||
"typeface-roboto-condensed": "latest",
|
||||
"typeface-raleway": "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": "2.0.1"
|
||||
}
|
||||
}
|
BIN
packages/bella/example/public/favicon.ico
Normal file
BIN
packages/bella/example/public/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
40
packages/bella/example/public/index.html
Normal file
40
packages/bella/example/public/index.html
Normal file
|
@ -0,0 +1,40 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="theme-color" content="#000000">
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is added to the
|
||||
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>bella</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
You need to enable JavaScript to run this app.
|
||||
</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
15
packages/bella/example/public/manifest.json
Normal file
15
packages/bella/example/public/manifest.json
Normal file
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"short_name": "bella",
|
||||
"name": "bella",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
}
|
||||
],
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
29
packages/bella/example/src/App.js
Normal file
29
packages/bella/example/src/App.js
Normal file
|
@ -0,0 +1,29 @@
|
|||
import React from 'react'
|
||||
import freesewing from '@freesewing/core'
|
||||
import Workbench from '@freesewing/components/Workbench'
|
||||
import 'typeface-roboto-condensed'
|
||||
import 'typeface-raleway'
|
||||
import '@freesewing/css-theme'
|
||||
|
||||
import Pattern from 'pattern'
|
||||
|
||||
const App = (props) => {
|
||||
// You can use this to add transations
|
||||
/*
|
||||
let translations = {
|
||||
JSON: 'JSON',
|
||||
someOtherString: 'Some other string that needs translation'
|
||||
}
|
||||
*/
|
||||
|
||||
return (
|
||||
<Workbench
|
||||
freesewing={freesewing}
|
||||
Pattern={Pattern}
|
||||
userLanguage="en"
|
||||
//translations={translations}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
11
packages/bella/example/src/index.js
Normal file
11
packages/bella/example/src/index.js
Normal file
|
@ -0,0 +1,11 @@
|
|||
import React from 'react'
|
||||
import ReactDOM from 'react-dom'
|
||||
import App from './App'
|
||||
import * as serviceWorker from './serviceWorker'
|
||||
|
||||
ReactDOM.render(<App />, 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()
|
123
packages/bella/example/src/serviceWorker.js
Normal file
123
packages/bella/example/src/serviceWorker.js
Normal file
|
@ -0,0 +1,123 @@
|
|||
// 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()
|
||||
})
|
||||
}
|
||||
}
|
94
packages/bella/package.json
Normal file
94
packages/bella/package.json
Normal file
|
@ -0,0 +1,94 @@
|
|||
{
|
||||
"name": "@freesewing/bella",
|
||||
"version": "2.10.2",
|
||||
"description": "A FreeSewing pattern for a womenswear bodice block",
|
||||
"author": "Joost De Cock <joost@decock.org> (https://github.com/joostdecock)",
|
||||
"homepage": "https://freesewing.org/",
|
||||
"repository": "github:freesewing/freesewing",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/freesewing/freesewing/issues"
|
||||
},
|
||||
"keywords": [
|
||||
"freesewing",
|
||||
"design",
|
||||
"diy",
|
||||
"fashion",
|
||||
"made to measure",
|
||||
"parametric design",
|
||||
"pattern",
|
||||
"sewing",
|
||||
"sewing pattern"
|
||||
],
|
||||
"main": "dist/index.js",
|
||||
"module": "dist/index.mjs",
|
||||
"scripts": {
|
||||
"clean": "rimraf dist",
|
||||
"build": "rollup -c",
|
||||
"test": "BABEL_ENV=production ../../node_modules/.bin/_mocha tests/*.test.js --require @babel/register",
|
||||
"pubtest": "npm publish --registry http://localhost:6662",
|
||||
"pubforce": "npm publish",
|
||||
"symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -",
|
||||
"start": "rollup -c -w",
|
||||
"netlify": "echo \"Not configured yet\"",
|
||||
"testci": "BABEL_ENV=production ./node_modules/.bin/_mocha tests/*.test.js --require @babel/register"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@freesewing/core": "^2.10.2",
|
||||
"@freesewing/plugin-bundle": "^2.10.2"
|
||||
},
|
||||
"dependencies": {},
|
||||
"devDependencies": {
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^7.6.0",
|
||||
"babel-jest": "^26.2.2",
|
||||
"jest": "26.2.2",
|
||||
"@freesewing/components": "^2.10.2",
|
||||
"@freesewing/css-theme": "^2.10.2",
|
||||
"@freesewing/i18n": "^2.10.2",
|
||||
"@freesewing/mui-theme": "^2.10.2",
|
||||
"@freesewing/plugin-bust": "^2.10.2",
|
||||
"@freesewing/plugin-buttons": "^2.10.2",
|
||||
"@freesewing/plugin-flip": "^2.10.2",
|
||||
"@freesewing/utils": "^2.10.2",
|
||||
"@svgr/rollup": "^2.4.1",
|
||||
"cross-env": "^7.0.2",
|
||||
"react-scripts": "^3.4.1",
|
||||
"webpack": "^4.44.1",
|
||||
"rollup": "^2.23.0",
|
||||
"@rollup/plugin-babel": "^5.1.0",
|
||||
"rollup-plugin-terser": "^6.1.0",
|
||||
"@rollup/plugin-commonjs": "^14.0.0",
|
||||
"@rollup/plugin-json": "^4.1.0",
|
||||
"@rollup/plugin-node-resolve": "^8.4.0",
|
||||
"rollup-plugin-peer-deps-external": "^2.2.3",
|
||||
"@material-ui/core": "^4.11.0",
|
||||
"@material-ui/icons": "4.9.1",
|
||||
"@material-ui/lab": "^v4.0.0-alpha.56",
|
||||
"react-intl": "^5.4.5",
|
||||
"prop-types": "^15.7.2",
|
||||
"mocha": "^8.1.0",
|
||||
"chai": "^4.2.0",
|
||||
"chai-string": "^1.5.0",
|
||||
"@babel/register": "^7.10.5"
|
||||
},
|
||||
"files": [
|
||||
"dist/*",
|
||||
"README.md",
|
||||
"package.json"
|
||||
],
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"tag": "latest"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0",
|
||||
"npm": ">=6"
|
||||
},
|
||||
"rollup": {
|
||||
"exports": "default"
|
||||
}
|
||||
}
|
37
packages/bella/rollup.config.js
Normal file
37
packages/bella/rollup.config.js
Normal file
|
@ -0,0 +1,37 @@
|
|||
import resolve from '@rollup/plugin-node-resolve'
|
||||
import commonjs from '@rollup/plugin-commonjs'
|
||||
import json from '@rollup/plugin-json'
|
||||
import { terser } from 'rollup-plugin-terser'
|
||||
import peerDepsExternal from 'rollup-plugin-peer-deps-external'
|
||||
import { name, version, description, author, license, main, module, rollup } from './package.json'
|
||||
|
||||
const output = [
|
||||
{
|
||||
file: main,
|
||||
format: 'cjs',
|
||||
sourcemap: true,
|
||||
exports: rollup.exports
|
||||
}
|
||||
]
|
||||
if (typeof module !== 'undefined')
|
||||
output.push({
|
||||
file: module,
|
||||
format: 'es',
|
||||
sourcemap: true
|
||||
})
|
||||
|
||||
export default {
|
||||
input: 'src/index.js',
|
||||
output,
|
||||
plugins: [
|
||||
peerDepsExternal(),
|
||||
resolve({ modulesOnly: true }),
|
||||
commonjs(),
|
||||
json(),
|
||||
terser({
|
||||
output: {
|
||||
preamble: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */`
|
||||
}
|
||||
})
|
||||
]
|
||||
}
|
170
packages/bella/src/back.js
Normal file
170
packages/bella/src/back.js
Normal file
|
@ -0,0 +1,170 @@
|
|||
export default function (part) {
|
||||
let {
|
||||
store,
|
||||
sa,
|
||||
Point,
|
||||
points,
|
||||
Path,
|
||||
paths,
|
||||
options,
|
||||
complete,
|
||||
paperless,
|
||||
macro,
|
||||
utils,
|
||||
units,
|
||||
measurements,
|
||||
Snippet,
|
||||
snippets,
|
||||
raise
|
||||
} = part.shorthand()
|
||||
|
||||
// Add original outline
|
||||
points.origin = new Point(0, 0)
|
||||
snippets.base = new Snippet('bella-back', points.origin)
|
||||
|
||||
// Get to work
|
||||
points.cbNeck = new Point(0, measurements.neck * options.backNeckCutout)
|
||||
points.hps = new Point(measurements.neck * options.neckWidthBack, 0)
|
||||
points.cbNeckCp1 = new Point(points.hps.x * 0.8, points.cbNeck.y)
|
||||
let slope = measurements.shoulderSlope * options.shoulderSlopeBack * -1
|
||||
points.shoulder = utils.beamsIntersect(
|
||||
new Point((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2, 0),
|
||||
new Point((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2, 100),
|
||||
points.hps,
|
||||
points.hps.shift(slope, 85)
|
||||
)
|
||||
points.armholePitch = new Point(
|
||||
points.shoulder.x * options.acrossBackFactor,
|
||||
measurements.hpsToWaistBack * options.backArmholePitchDepth
|
||||
)
|
||||
|
||||
// Construct waist and dart
|
||||
points.dartTip = new Point(
|
||||
measurements.underbust * options.backDartLocation,
|
||||
measurements.hpsToWaistBack * options.backDartHeight
|
||||
)
|
||||
let backWidth = (measurements.underbust / 4) * (1 + options.chestEase)
|
||||
let waistWidth = (measurements.waistBack / 2) * (1 + options.waistEase)
|
||||
let reduction = backWidth - waistWidth
|
||||
points.cbWaist = new Point(0, measurements.hpsToWaistBack)
|
||||
points.waistCenter = points.cbWaist.shift(0, reduction * options.backCenterWaistReduction)
|
||||
points.waistSide = points.waistCenter.shift(
|
||||
options.backHemSlope,
|
||||
waistWidth + reduction * (1 - options.backCenterWaistReduction / 2)
|
||||
)
|
||||
points.dartBottomCenter = utils.beamIntersectsX(
|
||||
points.waistCenter,
|
||||
points.waistSide,
|
||||
points.dartTip.x
|
||||
)
|
||||
points.dartBottomLeft = points.dartBottomCenter.shift(
|
||||
180,
|
||||
(reduction * (1 - options.backCenterWaistReduction * 0.5)) / 2
|
||||
)
|
||||
points.dartBottomRight = points.dartBottomLeft.rotate(180, points.dartBottomCenter)
|
||||
points.dartLeftCp = points.dartBottomLeft.shift(90, points.dartTip.dy(points.dartBottomLeft) / 2)
|
||||
points.dartRightCp = new Point(points.dartBottomRight.x, points.dartLeftCp.y)
|
||||
// Find out location of the armhole
|
||||
let armholeDepth = measurements.hpsToWaistBack * options.armholeDepth + points.shoulder.y
|
||||
points.cbNeckCp2 = new Point(0, armholeDepth)
|
||||
points.dartLeftArmhole = utils.curveIntersectsY(
|
||||
points.dartBottomLeft,
|
||||
points.dartLeftCp,
|
||||
points.dartTip,
|
||||
points.dartTip,
|
||||
armholeDepth
|
||||
)
|
||||
points.cbArmhole = utils.curveIntersectsY(
|
||||
points.cbNeck,
|
||||
points.cbNeckCp2,
|
||||
points.waistCenter,
|
||||
points.waistCenter,
|
||||
armholeDepth
|
||||
)
|
||||
let extra = points.dartLeftArmhole.dx(points.dartTip) * 2 + points.cbArmhole.x
|
||||
points.armhole = new Point(
|
||||
(measurements.underbust / 4) * (1 + options.chestEase) + extra,
|
||||
armholeDepth
|
||||
)
|
||||
|
||||
// Control points for the side seam
|
||||
points.waistSideCp2 = points.waistSide.shift(90, points.armhole.dy(points.waistSide) / 2)
|
||||
|
||||
// Construct armhole
|
||||
points.armholeCp2 = points.armhole.shift(180 - options.backArmholeSlant, 40)
|
||||
points.armholePitchCp1 = points.armholePitch.shift(-90 - options.backArmholeSlant, 40)
|
||||
points.armholeCpTarget = utils.beamsIntersect(
|
||||
points.armhole,
|
||||
points.armhole.shift(180 - options.backArmholeSlant, 40),
|
||||
points.armholePitch,
|
||||
points.armholePitch.shift(-90 - options.backArmholeSlant, 40)
|
||||
)
|
||||
points.armholeCp2 = points.armhole.shiftFractionTowards(
|
||||
points.armholeCpTarget,
|
||||
options.backArmholeCurvature
|
||||
)
|
||||
points.armholePitchCp1 = points.armholePitch.shiftFractionTowards(
|
||||
points.armholeCpTarget,
|
||||
options.backArmholeCurvature
|
||||
)
|
||||
points.armholePitchCp2 = points.armholePitchCp1.rotate(180, points.armholePitch)
|
||||
|
||||
// Store the back width at bust level
|
||||
points.bustSide = utils.curveIntersectsY(
|
||||
points.waistSide,
|
||||
points.waistSideCp2,
|
||||
points.armhole,
|
||||
points.armhole,
|
||||
measurements.hpsToBust
|
||||
)
|
||||
if (!points.bustSide) raise.error('Could not find bust height in side seam of back part')
|
||||
points.bustCenter = utils.curveIntersectsY(
|
||||
points.cbNeck,
|
||||
points.cbNeckCp2,
|
||||
points.waistCenter,
|
||||
points.waistCenter,
|
||||
measurements.hpsToBust
|
||||
)
|
||||
if (!points.bustCenter) raise.error('Could not find bust height in center seam of back part')
|
||||
points.bustDartLeft = utils.curveIntersectsY(
|
||||
points.dartBottomLeft,
|
||||
points.dartLeftCp,
|
||||
points.dartTip,
|
||||
points.dartTip,
|
||||
measurements.hpsToBust
|
||||
)
|
||||
if (!points.bustDartLeft) raise.error('Could not find bust height in back dart')
|
||||
points.bustDartRight = points.bustDartLeft.flipX(points.dartTip)
|
||||
store.set(
|
||||
'bustWidthBack',
|
||||
points.bustCenter.dx(points.bustDartLeft) + points.bustDartRight.dx(points.bustSide)
|
||||
)
|
||||
|
||||
// Store things we'll need in the front parts
|
||||
store.set(
|
||||
'sideSeamLength',
|
||||
new Path().move(points.waistSide).curve_(points.waistSideCp2, points.armhole).length()
|
||||
)
|
||||
store.set(
|
||||
'backHemLength',
|
||||
points.waistCenter.dist(points.dartBottomLeft) + points.dartBottomRight.dist(points.waistSide)
|
||||
)
|
||||
store.set('sideReduction', points.armhole.x - points.waistSide.x)
|
||||
|
||||
paths.saBase = new Path()
|
||||
.move(points.cbNeck)
|
||||
.curve_(points.cbNeckCp2, points.waistCenter)
|
||||
.line(points.dartBottomLeft)
|
||||
.curve_(points.dartLeftCp, points.dartTip)
|
||||
._curve(points.dartRightCp, points.dartBottomRight)
|
||||
.line(points.waistSide)
|
||||
.curve_(points.waistSideCp2, points.armhole)
|
||||
.curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch)
|
||||
.curve_(points.armholePitchCp2, points.shoulder)
|
||||
.line(points.hps)
|
||||
._curve(points.cbNeckCp1, points.cbNeck)
|
||||
.close()
|
||||
.attr('class', 'fabric')
|
||||
|
||||
return part
|
||||
}
|
17
packages/bella/src/bella.js
Normal file
17
packages/bella/src/bella.js
Normal file
|
@ -0,0 +1,17 @@
|
|||
// Plugin that provides the base outlines
|
||||
const bella = {
|
||||
name: 'bella',
|
||||
version: 1,
|
||||
hooks: {
|
||||
preRender: function (svg) {
|
||||
if (svg.attributes.get('freesewing:plugin-bella') === false)
|
||||
svg.attributes.set('freesewing:plugin-bella', 1)
|
||||
let style = 'stroke: #3bc9db; stroke-width: 1; fill: none;'
|
||||
svg.defs += `<path style="${style}" id='bella-back' transform="translate(-0.5 145)" d='m 174.6,9.593 -14,-1 M 74.61,-145.1 188.6,-93.01 M 7.607,-122 l 9.003,-0.4 9,-0.9 9,-1.7 9,-2.1 9,-3 8,-4 7,-5.1 7,-5.9 M 0.5072,-122 H 7.607 M 0.5072,-15.31 V -122 m 8.0998,319 -3.1,-52.9 -3,-53.11 -1,-53.1 -0.9998,-53.2 M 14.61,296.5 8.607,197 m 18.003,99 -12,0.5 m 85,-4 -37,1.4 -36,2.1 m 91.99,-236.71 -5,38.7 -4,39.01 -4,38.9 -3,38.9 -2,38.9 -0.99,38.8 m 32.99,0.3 -1,-38.9 -1,-39.1 -2,-38.7 -3,-38.9 -3,-39.11 -4,-38.8 m 116,229.31 -24,0.5 -24,0.5 -27,1.6 -27,1.6 m 106,-192.1 -2,45.3 -1,41.8 -1,41.5 v 59.3 M 174.6,9.593 v 10.697 10.6 l 2,10.7 2,10.4 3,10.1 5,9.5 4,6.1 5,5.3 5,4.6 6,3.9 6,3 7,2.5 9,2.4 10,1.31 m -50,-193.71 -2,12.8 -3,12.6 -2,12.8 -2,12.7 -2,12.9 -1,12.8 -1,13.103 -1,12.9 M 29.61,-53.71 l -2,1 m 2,1 v -2 m -2,1 2,1 m 0,132.5 -2,0.9 m 2,1 v -1.9 m -2,0.9 2,1 m -1,-180.2 v 44.8 m 0,89.6 v 44.8'/>`
|
||||
svg.defs += `<path style="${style}" id='bella-front-shoulder-dart' transform="translate(200 155)" d='M 50.71,3.273 64.41,0.3728 M 0.5055,-78.05 46.41,-117.4 m 4.3,120.673 -3.2,-9.1 -3.7,-8.903 -4.2,-8.7 -4.7,-8.4 -5,-8.2 -5.3,-8 -5.6,-7.8 -6,-7.51 -6.105,-7.62 -6.3995,-7.09 m 7.6995,178.25 8.105,-1.81 7.9,-3.1 7.2,-4.2 5.7,-4.9 5.1,-5.9 4.2,-6.4 3.8,-7.5 2.6,-7.8 1.7,-7.9 0.8,-11.7 -0.4,-11.5 -1.6,-12.22 -2.6,-11.997 m 96.39,21.117 0.6,-55.02 1,-54.91 1.4,-54.96 m 0,244.8 -1.3,-20.01 -0.9,-20 -0.5,-19.9 -0.3,-20 m -28.1,6.3 8.3,18.1 8,18.3 7.7,18.5 7.1,18.71 m -103.69,-221.7 12.7,24.45 12.6,24.39 12.2,24.53 12.1,24.7 L 107.7,5.573 119,30.69 M 12.11,288.3 l 0.6,-29.9 v -29.7 l -1.1,-37.8 -1.5,-37.6 -1.905,-53.1 m 117.895,196.3 -28.49,-2.7 -28.6,-2.1 -28.4,-1.8 -28.5,-1.6 m 137.99,-164.1 -7,28.3 -5.7,28.6 -4.6,28.6 -3.4,28.8 -2.2,29.1 -1.1,28.9 m 49.1,-0.6 -1.4,-28.8 -2.5,-28.8 -3.7,-28.9 -4.7,-28.6 -5.8,-28.3 -7,-28.3 m 109.4,166.2 -25.8,1.3 -25.8,1.6 -32.7,2.6 m 95.2,-5.5 H 259.5 M 270.4,-83.16 V 290.4 m -64,-446.4 -0.7,6.7 v 6.7 l 0.6,6.9 1.2,6.6 1.9,6.7 2.5,6.1 3.3,6.1 4,5.5 4.6,4.95 5.3,4.39 5.6,3.6 6.1,3.2 6.4,2.3 6.5,1.7 6.8,1.11 6.7,0.29 M 150.1,-140.5 206.4,-156 m 60.8,72.84 h 3.2 m 1.1,186.46 -2.2,1 m 2.2,1.1 v -2.1 m -2.2,1 2.2,1.1 m 0,88.4 -2.2,0.8 m 2.2,1.1 v -1.9 m -2.2,0.8 2.2,1.1 M 270.4,74.29 v 30.01 m 0,60.1 v 30.2' />`
|
||||
svg.defs += `<path style="${style}" id='bella-front-side-dart' transform="scale(-1 1) translate(-289.5 155)" d='m 122.5,-29.13 14,3.3 m 33,130.53 -25,-1.7 -25,-1.5 -24.99,-0.9 -25,0.9 -25,0.7 -25,1.7 m 91.99,-227.7 114,-32.4 m 0,0 v 7.3 6.4 6.5 l 1,7.3 2,6.5 3,6.5 3,5.7 4,5.6 5,4.9 5,3.99 6,4.11 6,3.2 5.9,2.4 7.2,1.7 6.1,0.79 h 6.8 m -164,54.18 1,-9.7 v -9.7 -9.67 l -1,-9.71 -1,-9.79 -1,-8.92 -2,-9.68 -2,-9.7 -2,-8.9 -3,-8.9 m -68.99,164.49 8,1.5 9,0.8 8,-0.8 7,-2.4 8,-3.2 6,-3.2 6,-5.8 5.99,-5.5 5,-6.62 6,-10.497 4,-10.6 4,-12.103 3,-11.4 M 15.51,103.9 l 27,-63.21 m -9,127.01 23,-9.3 23,-9.5 22.99,-10.1 23,-10.5 22,-11.4 22,-12.2 m -137.99,183.6 1,-29.6 v -29.9 l -1,-29.9 -1,-29.9 m 114.99,127.5 -29,-2.4 -27.99,-2.3 -29,-1.9 -28,-1.6 M 169.5,124 l -7,27.5 -5,27.8 -5,27.5 -3,28.1 -3,30.7 -1,30.9 m 49,-0.2 -1,-30.7 -3,-30.7 -4,-27.8 -5,-27.8 -5,-27.8 -7,-27.5 m 109.1,166.4 -25.1,1.4 -26,1.6 -33,2.9 m 92,-379.61 h 3 V 290.4 m 0,0 h -10.9 m 11.9,-186.5 -1.8,0.8 m 1.8,0.7 v -1.5 m -1.8,0.8 1.8,0.7 m 0,88.5 -1.8,0.8 m 1.8,1.3 v -2.1 m -1.8,0.8 1.8,1.3 M 15.51,103.9 h 5 M 0.5053,141.5 15.51,103.9 M 30.51,169 0.5053,141.5 M 30.51,169 l 4,-1.9' />`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default bella
|
29
packages/bella/src/front-shoulder-dart.js
Normal file
29
packages/bella/src/front-shoulder-dart.js
Normal file
|
@ -0,0 +1,29 @@
|
|||
export default function (part) {
|
||||
let {
|
||||
store,
|
||||
sa,
|
||||
Point,
|
||||
points,
|
||||
Path,
|
||||
paths,
|
||||
options,
|
||||
complete,
|
||||
paperless,
|
||||
macro,
|
||||
utils,
|
||||
units,
|
||||
measurements,
|
||||
Snippet,
|
||||
snippets
|
||||
} = part.shorthand()
|
||||
|
||||
points.origin = new Point(0, 0)
|
||||
snippets.base = new Snippet('bella-front-shoulder-dart', points.origin)
|
||||
|
||||
points.a = new Point(0, 0)
|
||||
points.b = new Point(280, 450)
|
||||
|
||||
paths.diag = new Path().move(points.a).line(points.b).attr('class', 'hidden')
|
||||
|
||||
return part
|
||||
}
|
181
packages/bella/src/front-side-dart.js
Normal file
181
packages/bella/src/front-side-dart.js
Normal file
|
@ -0,0 +1,181 @@
|
|||
export default function (part) {
|
||||
let {
|
||||
store,
|
||||
sa,
|
||||
Point,
|
||||
points,
|
||||
Path,
|
||||
paths,
|
||||
options,
|
||||
complete,
|
||||
paperless,
|
||||
macro,
|
||||
utils,
|
||||
units,
|
||||
measurements,
|
||||
Snippet,
|
||||
snippets
|
||||
} = part.shorthand()
|
||||
|
||||
// Add original outline
|
||||
points.origin = new Point(0, 0)
|
||||
snippets.base = new Snippet('bella-front-side-dart', points.origin)
|
||||
|
||||
// Diagonal line to make sure the original outline isn't cropped
|
||||
points.a = new Point(0, 0)
|
||||
points.b = new Point(290, 450)
|
||||
paths.diag = new Path().move(points.a).line(points.b).attr('class', 'hidden')
|
||||
|
||||
// Get to work
|
||||
points.cfNeck = new Point(0, measurements.neck * options.collarFactor)
|
||||
points.hps = new Point(measurements.neck * options.neckWidthFront, 0)
|
||||
points.cfNeckCp1 = new Point(points.hps.x * 0.8, points.cfNeck.y)
|
||||
points.hpsCp2 = new Point(points.hps.x, points.cfNeck.y / 2)
|
||||
let slope = measurements.shoulderSlope * (2 - options.shoulderSlopeBack) * -1
|
||||
let xShoulder =
|
||||
((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2) *
|
||||
options.frontShoulderWidth
|
||||
points.shoulder = utils.beamsIntersect(
|
||||
new Point(xShoulder, 0),
|
||||
new Point(xShoulder, 100),
|
||||
points.hps,
|
||||
points.hps.shift(slope, 85)
|
||||
)
|
||||
// Front is more narrow
|
||||
points.ex = points.shoulder.shift(180, 10)
|
||||
points.armholePitch = new Point(
|
||||
points.shoulder.x * options.acrossBackFactor,
|
||||
measurements.hpsToWaistBack * options.frontArmholePitchDepth
|
||||
)
|
||||
// Find out location of the armhole
|
||||
let armholeDepth = measurements.hpsToWaistBack * options.armholeDepth + points.shoulder.y
|
||||
points.armhole = new Point(
|
||||
(measurements.highBust / 4) * (1 + options.chestEase) * options.highBustWidth,
|
||||
armholeDepth
|
||||
)
|
||||
|
||||
// Bust point
|
||||
points.bust = new Point(measurements.bustSpan / 2, measurements.hpsToBust)
|
||||
|
||||
// Construct armhole
|
||||
points.armholeCp2 = points.armhole.shift(180, 40)
|
||||
points.armholePitchCp1 = points.armholePitch.shift(-90, 40)
|
||||
points.armholeCpTarget = utils.beamsIntersect(
|
||||
points.armhole,
|
||||
points.armhole.shift(180, 40),
|
||||
points.armholePitch,
|
||||
points.armholePitch.shift(-90, 40)
|
||||
)
|
||||
points.armholeCp2 = points.armhole.shiftFractionTowards(
|
||||
points.armholeCpTarget,
|
||||
options.frontArmholeCurvature
|
||||
)
|
||||
points.armholePitchCp1 = points.armholePitch.shiftFractionTowards(
|
||||
points.armholeCpTarget,
|
||||
options.frontArmholeCurvature
|
||||
)
|
||||
points.armholePitchCp2 = points.armholePitchCp1.rotate(180, points.armholePitch)
|
||||
|
||||
// Draft body without breasts
|
||||
points.cfHem = new Point(0, measurements.hpsToWaistFront)
|
||||
points.sideHem = new Point(points.armhole.x, points.cfHem.y)
|
||||
|
||||
// Create room for breasts
|
||||
// How much horizontal room do we need to add?
|
||||
let target =
|
||||
(measurements.chest * (1 + options.chestEase - options.fullChestEaseReduction)) / 2 -
|
||||
store.get('bustWidthBack')
|
||||
let rot = ['armhole', 'armholeCp2', 'armholePitchCp1', 'bustB', 'sideHem']
|
||||
// Rotate until we've got enough room
|
||||
points.bustA = points.bust.clone()
|
||||
points.bustB = points.bust.clone()
|
||||
points.bustSide = utils.beamIntersectsY(points.armhole, points.sideHem, points.bust.y)
|
||||
let steps = 0
|
||||
let angle = 0
|
||||
let increment = 0.5
|
||||
while (points.bustSide.x < target && steps < 80) {
|
||||
for (const p of rot) points[p] = points[p].rotate(increment, points.armholePitch)
|
||||
angle += increment
|
||||
points.bustSide = utils.beamIntersectsY(points.armhole, points.sideHem, points.bust.y)
|
||||
steps++
|
||||
}
|
||||
store.set('bustDartAngleSide', angle)
|
||||
|
||||
// Smooth out the armhole pitch point
|
||||
points.pitchMax = utils.beamsIntersect(
|
||||
points.armholePitchCp1,
|
||||
points.armholePitchCp2,
|
||||
points.armholePitch,
|
||||
points.armholePitch.shift(points.armholePitchCp1.angle(points.armholePitchCp2) - 90, 30)
|
||||
)
|
||||
points.armholePitch = points.armholePitch.shiftFractionTowards(points.pitchMax, 0.2)
|
||||
points.armholePitchCp1 = points.armholePitch.shiftFractionTowards(
|
||||
points.armholePitchCp2.rotate(180, points.armholePitch),
|
||||
0.8
|
||||
)
|
||||
|
||||
// Bust dart
|
||||
points.bustDartTop = utils.beamsIntersect(
|
||||
points.armhole,
|
||||
points.sideHem,
|
||||
points.bust,
|
||||
points.bust.shift(0, 100)
|
||||
)
|
||||
points.bustDartBottom = points.bustDartTop.rotate(angle * -1, points.bust)
|
||||
points.bustDartTip = points.bustDartTop.shiftFractionTowards(points.bust, options.bustDartLength)
|
||||
|
||||
// Side seam length
|
||||
let aboveDart = points.armhole.dist(points.bustDartTop)
|
||||
let belowDart = store.get('sideSeamLength') - aboveDart
|
||||
points.sideHemInitial = points.bustDartBottom
|
||||
.shift(-90, belowDart)
|
||||
.shift(180, store.get('sideReduction'))
|
||||
points.sideHem = points.bustDartBottom.shiftTowards(points.sideHemInitial, belowDart)
|
||||
|
||||
// Hem
|
||||
let hemLen = (measurements.waist / 2) * (1 + options.waistEase) - store.get('backHemLength')
|
||||
let reduce = points.cfHem.dist(points.sideHemInitial) - hemLen
|
||||
|
||||
// Waist dart
|
||||
points.waistDartHem = new Point(points.bustDartTip.x, points.cfHem.y)
|
||||
points.waistDartLeft = points.waistDartHem.shift(180, reduce / 2)
|
||||
points.waistDartRight = points.waistDartHem.shift(0, reduce / 2)
|
||||
points.waistDartTip = points.waistDartHem.shiftFractionTowards(
|
||||
points.bustDartTip,
|
||||
options.bustDartLength
|
||||
)
|
||||
points.waistDartLeftCp = points.waistDartLeft.shift(
|
||||
90,
|
||||
points.waistDartHem.dist(points.bustDartTip) / 2
|
||||
)
|
||||
points.waistDartRightCp = points.waistDartRight.shift(
|
||||
90,
|
||||
points.waistDartHem.dist(points.bustDartTip) / 2
|
||||
)
|
||||
|
||||
points.f = new Point(0, 445.5)
|
||||
points.g = new Point(95, 451)
|
||||
points.h = new Point(144, 451)
|
||||
points.i = new Point(258, 443)
|
||||
points.i = new Point(0, 260)
|
||||
points.j = new Point(274, 260)
|
||||
|
||||
paths.saBase = new Path()
|
||||
.move(points.cfHem)
|
||||
.line(points.waistDartLeft)
|
||||
.curve_(points.waistDartLeftCp, points.waistDartTip)
|
||||
._curve(points.waistDartRightCp, points.waistDartRight)
|
||||
.line(points.sideHem)
|
||||
.line(points.bustDartBottom)
|
||||
.line(points.bustDartTip)
|
||||
.line(points.bustDartTop)
|
||||
.line(points.armhole)
|
||||
.curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch)
|
||||
.curve_(points.armholePitchCp2, points.shoulder)
|
||||
.line(points.hps)
|
||||
.curve(points.hpsCp2, points.cfNeckCp1, points.cfNeck)
|
||||
.line(points.cfHem)
|
||||
.attr('class', 'fabric')
|
||||
|
||||
return part
|
||||
}
|
20
packages/bella/src/index.js
Normal file
20
packages/bella/src/index.js
Normal file
|
@ -0,0 +1,20 @@
|
|||
import freesewing from '@freesewing/core'
|
||||
import plugins from '@freesewing/plugin-bundle'
|
||||
import config from '../config'
|
||||
// Parts
|
||||
import draftBack from './back'
|
||||
import draftFrontSideDart from './front-side-dart'
|
||||
import draftFrontShoulderDart from './front-shoulder-dart'
|
||||
|
||||
// Base outlines
|
||||
import bellaPlugin from './bella'
|
||||
|
||||
// Create design
|
||||
const Pattern = new freesewing.Design(config, [plugins, bellaPlugin])
|
||||
|
||||
// Attach draft methods to prototype
|
||||
Pattern.prototype.draftBack = (part) => draftBack(part)
|
||||
Pattern.prototype.draftFrontSideDart = (part) => draftFrontSideDart(part)
|
||||
Pattern.prototype.draftFrontShoulderDart = (part) => draftFrontShoulderDart(part)
|
||||
|
||||
export default Pattern
|
39
packages/bella/tests/shared.test.js
Normal file
39
packages/bella/tests/shared.test.js
Normal file
|
@ -0,0 +1,39 @@
|
|||
// This file is auto-generated.
|
||||
// Changes you make will be overwritten.
|
||||
const expect = require("chai").expect;
|
||||
const models = require("@freesewing/models")
|
||||
const patterns = require("@freesewing/pattern-info")
|
||||
|
||||
const Bella = require('../dist')
|
||||
|
||||
// Shared tests
|
||||
const testPatternConfig = require('../../../tests/patterns/config')
|
||||
const testPatternDrafting = require('../../../tests/patterns/drafting')
|
||||
const testPatternSampling = require('../../../tests/patterns/sampling')
|
||||
|
||||
// Test config
|
||||
testPatternConfig(
|
||||
'bella',
|
||||
new Bella(),
|
||||
expect,
|
||||
models,
|
||||
patterns
|
||||
)
|
||||
|
||||
// Test drafting
|
||||
testPatternDrafting(
|
||||
'bella',
|
||||
Bella,
|
||||
expect,
|
||||
models,
|
||||
patterns
|
||||
)
|
||||
|
||||
// Test sampling
|
||||
testPatternSampling(
|
||||
'bella',
|
||||
Bella,
|
||||
expect,
|
||||
models,
|
||||
patterns
|
||||
)
|
Loading…
Add table
Add a link
Reference in a new issue