diff --git a/packages/examples/index.html b/packages/examples/index.html index 98cda6cc9a2..7f976e90a4e 100644 --- a/packages/examples/index.html +++ b/packages/examples/index.html @@ -25,18 +25,16 @@ pattern.settings.measurements = freesewing.models.men.manSize36; // Uncomment this line to enable paperless - //pattern.settings.paperless = true; + pattern.settings.paperless = true; // Some default settings pattern.settings.sa = 10; pattern.settings.units = 'metric'; -pattern.settings.only = 'macroGrainline'; -console.log('need1', pattern.needs('pointShift')); -console.log('need2', pattern.needs('pointShiftTowards')); -pattern.on('preRender', function(next) { - this.style += 'svg { background: yellow;}'; - next(); -}); +//pattern.settings.only = 'macroGrainline'; +//pattern.on('preRender', function(next) { +// this.style += 'g { border: 1px solid red; background: red;}'; +// next(); +//}); //pattern.sampleOption('chestEase'); //pattern.sampleMeasurement('chestCircumference'); diff --git a/packages/examples/package-lock.json b/packages/examples/package-lock.json index 8a4a82dda45..ada2040024a 100644 --- a/packages/examples/package-lock.json +++ b/packages/examples/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@freesewing/template", + "name": "@freesewing/examples", "version": "0.2.1", "lockfileVersion": 1, "requires": true, @@ -2911,9 +2911,9 @@ } }, "freesewing": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.7.1.tgz", - "integrity": "sha512-mbdyiqzhvy1zSSOid9ZoRG8pfYdbT/WnRIcyWNjCxl2TtT9v5BxDmmgo0DWpZgLW+gn08dBgnuBBgc5K5tALNw==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.8.3.tgz", + "integrity": "sha512-CxvkFFkQOYFnV8EDOdFqB6b1BpczX/P4MJ24X671Y7l44VUK5EOGk+MrFBoIGZj9UcL7PttNE9sH2Q+FHIcGPw==", "requires": { "bezier-js": "2.2.14", "bin-pack": "1.0.2", diff --git a/packages/examples/src/path.attr.js b/packages/examples/src/path.attr.js index 73815298a58..81527d1e95c 100644 --- a/packages/examples/src/path.attr.js +++ b/packages/examples/src/path.attr.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathAttrs = { draft: function(part) { diff --git a/packages/examples/src/path.clone.js b/packages/examples/src/path.clone.js index d5f1206f09e..3f8a10eeb62 100644 --- a/packages/examples/src/path.clone.js +++ b/packages/examples/src/path.clone.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathClone = { draft: function(part) { diff --git a/packages/examples/src/path.end.js b/packages/examples/src/path.end.js index 1cc544328e3..e87fd2c194d 100644 --- a/packages/examples/src/path.end.js +++ b/packages/examples/src/path.end.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathEnd = { draft: function(part) { diff --git a/packages/examples/src/path.join.js b/packages/examples/src/path.join.js index 89803341188..b9e3efdec3b 100644 --- a/packages/examples/src/path.join.js +++ b/packages/examples/src/path.join.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathJoin = { draft: function(part) { diff --git a/packages/examples/src/path.length.js b/packages/examples/src/path.length.js index fb038d60f22..9bdd6705e3f 100644 --- a/packages/examples/src/path.length.js +++ b/packages/examples/src/path.length.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathLength = { draft: function(part) { diff --git a/packages/examples/src/path.ops.js b/packages/examples/src/path.ops.js index 8d2a47cd880..9844b57beeb 100644 --- a/packages/examples/src/path.ops.js +++ b/packages/examples/src/path.ops.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathOps = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.A = new Point(10, 10) .attr('data-text', 'Move to point A') .attr('data-text-class', 'center text-xs'); diff --git a/packages/examples/src/path.shiftalong.js b/packages/examples/src/path.shiftalong.js index 6279072a0fc..5ff18592cae 100644 --- a/packages/examples/src/path.shiftalong.js +++ b/packages/examples/src/path.shiftalong.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathShiftAlong = { draft: function(part) { @@ -19,11 +18,13 @@ var pathShiftAlong = { points.X1 = paths.example.shiftAlong(20) - .attr('data-text', 'Shifted 2cm along this path') - .attr('data-text-class', 'center'); + .attr('data-text', "Shifted 2cm\nalong this path") + .attr('data-text-class', 'center') + .attr('data-text-lineheight', 6); points.X2 = paths.example.shiftAlong(90) - .attr('data-text', 'Shifted 9cm along this path') - .attr('data-text-class', 'center'); + .attr('data-text', "Shifted 9cm\nalong this path") + .attr('data-text-class', 'center') + .attr('data-text-lineheight', 6); snippets.Xl = new Snippet('x', points.X1); snippets.X2 = new Snippet('x', points.X2); diff --git a/packages/examples/src/path.shiftfractionalong.js b/packages/examples/src/path.shiftfractionalong.js index 91625dd280e..4e3827e3124 100644 --- a/packages/examples/src/path.shiftfractionalong.js +++ b/packages/examples/src/path.shiftfractionalong.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathShiftFractionAlong = { draft: function(part) { @@ -19,11 +18,13 @@ var pathShiftFractionAlong = { points.X1 = paths.example.shiftFractionAlong(0.2) - .attr('data-text', 'Shifted 20% along this path') - .attr('data-text-class', 'center'); + .attr('data-text', "Shifted 20%\nalong this path") + .attr('data-text-class', 'center') + .attr('data-text-lineheight', 6); points.X2 = paths.example.shiftFractionAlong(0.9) - .attr('data-text', 'Shifted 90% along this path') - .attr('data-text-class', 'center'); + .attr('data-text', "Shifted 90%\nalong this path") + .attr('data-text-class', 'center') + .attr('data-text-lineheight', 6); snippets.Xl = new Snippet('x', points.X1); snippets.X2 = new Snippet('x', points.X2); diff --git a/packages/examples/src/path.start.js b/packages/examples/src/path.start.js index 4a52b8b063c..0aa671b8e21 100644 --- a/packages/examples/src/path.start.js +++ b/packages/examples/src/path.start.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathStart = { draft: function(part) { diff --git a/packages/examples/src/point.angle.js b/packages/examples/src/point.angle.js index 443754397b1..c5cdf30d331 100644 --- a/packages/examples/src/point.angle.js +++ b/packages/examples/src/point.angle.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointAngle = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets} = part.shorthand(); - box(part, 80, 80); - points.sun = new Point(40, 40); points.moon1 = new Point(70, 40).attr('data-text', '0').attr('data-text-class', 'text-xl'); points.moon2 = new Point(40, 10).attr('data-text', 90).attr('data-text-class', 'text-xl'); diff --git a/packages/examples/src/point.dist.js b/packages/examples/src/point.dist.js index b87ecc20afe..a2084ea5a1a 100644 --- a/packages/examples/src/point.dist.js +++ b/packages/examples/src/point.dist.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointDist = { draft: function(part) { // prettier-ignore let {Point, points, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.from = new Point(10, 10); points.to = new Point(90, 40); diff --git a/packages/examples/src/point.dx.js b/packages/examples/src/point.dx.js index 9e23865d603..e768096d27e 100644 --- a/packages/examples/src/point.dx.js +++ b/packages/examples/src/point.dx.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointDx = { draft: function(part) { // prettier-ignore let {Point, points, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.from = new Point(10, 10); points.to = new Point(90, 40); diff --git a/packages/examples/src/point.dy.js b/packages/examples/src/point.dy.js index 226d74efdf3..5efe182f8dd 100644 --- a/packages/examples/src/point.dy.js +++ b/packages/examples/src/point.dy.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointDy = { draft: function(part) { // prettier-ignore let {Point, points, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.from = new Point(10, 10); points.to = new Point(90, 40); diff --git a/packages/examples/src/point.flipx.js b/packages/examples/src/point.flipx.js index 26964b4225d..12d3a430513 100644 --- a/packages/examples/src/point.flipx.js +++ b/packages/examples/src/point.flipx.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointFlipX = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.top = new Point(50, 10); points.out1 = new Point(70, 30); points.in1 = new Point(55, 35); diff --git a/packages/examples/src/point.flipy.js b/packages/examples/src/point.flipy.js index 4cee25ce29e..9dadbc5548f 100644 --- a/packages/examples/src/point.flipy.js +++ b/packages/examples/src/point.flipy.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointFlipX = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.start = new Point(0, 50); points.churchTowerWallLeft = new Point(10, 50); points.churchTowerRoofLeft = new Point(10, 30); diff --git a/packages/examples/src/point.rotate.js b/packages/examples/src/point.rotate.js index bcee8c99023..9726f5a39c8 100644 --- a/packages/examples/src/point.rotate.js +++ b/packages/examples/src/point.rotate.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointRotate = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets} = part.shorthand(); - box(part, 80, 80); - points.sun = new Point(40, 40); snippets.sun = new Snippet("notch", points.sun); points.moon = new Point(70, 40); diff --git a/packages/examples/src/point.shift.js b/packages/examples/src/point.shift.js index 287b221debc..009d9e134ce 100644 --- a/packages/examples/src/point.shift.js +++ b/packages/examples/src/point.shift.js @@ -1,14 +1,13 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointShift = { draft: function(part) { // prettier-ignore let {Point, points, Snippet, snippets, macro} = part.shorthand(); - box(part); - - points.A = new Point(90, 40).attr('data-text', 'Point A'); + points.A = new Point(90, 40) + .attr('data-text', 'Point A') + .attr('data-text-class', 'right'); points.B = points.A.shift(155, 70) .attr('data-text', "Point B is point A shifted 7cm\nat a 155 degree angle") .attr('data-text-lineheight', 6); diff --git a/packages/examples/src/point.shiftfractiontowards.js b/packages/examples/src/point.shiftfractiontowards.js index d53dde778bf..31b313e6b21 100644 --- a/packages/examples/src/point.shiftfractiontowards.js +++ b/packages/examples/src/point.shiftfractiontowards.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointShiftFractionTowards = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.A = new Point(90, 70).attr('data-text', 'Point A'); points.B = new Point(10, 10).attr('data-text', 'Point B'); points.C = points.A.shiftFractionTowards(points.B, 0.5) diff --git a/packages/examples/src/point.shiftoutwards.js b/packages/examples/src/point.shiftoutwards.js index 5e8073b1530..15fd9e2f051 100644 --- a/packages/examples/src/point.shiftoutwards.js +++ b/packages/examples/src/point.shiftoutwards.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointShiftOutwards = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.A = new Point(90, 70).attr('data-text', 'Point A'); points.B = new Point(10, 10).attr('data-text', 'Point B'); points.C = points.A.shiftOutwards(points.B, 30) diff --git a/packages/examples/src/point.shifttowards.js b/packages/examples/src/point.shifttowards.js index fdd79c3a732..5f5377702b4 100644 --- a/packages/examples/src/point.shifttowards.js +++ b/packages/examples/src/point.shifttowards.js @@ -1,13 +1,10 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pointShiftTowards = { draft: function(part) { // prettier-ignore let {Point, points, Path, paths, Snippet, snippets, macro} = part.shorthand(); - box(part); - points.A = new Point(90, 70).attr('data-text', 'Point A'); points.B = new Point(10, 10).attr('data-text', 'Point B'); points.C = points.A.shiftTowards(points.B, 35) diff --git a/packages/examples/src/settings.sa.js b/packages/examples/src/settings.sa.js index 98bbe4fc59a..8e22888f9a8 100644 --- a/packages/examples/src/settings.sa.js +++ b/packages/examples/src/settings.sa.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var pathOffset = { draft: function(part) { diff --git a/packages/examples/src/utils.beamcrossesx.js b/packages/examples/src/utils.beamcrossesx.js index 76fae7ee0d9..d26a723d8b5 100644 --- a/packages/examples/src/utils.beamcrossesx.js +++ b/packages/examples/src/utils.beamcrossesx.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var utilsBeamCrossesX = { draft: function(part) { diff --git a/packages/examples/src/utils.beamscross.js b/packages/examples/src/utils.beamscross.js index a6da16928c7..a3a796e8466 100644 --- a/packages/examples/src/utils.beamscross.js +++ b/packages/examples/src/utils.beamscross.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var utilsBeamsCross = { draft: function(part) { diff --git a/packages/examples/src/utils.linescross.js b/packages/examples/src/utils.linescross.js index eead313dc54..63678ee135c 100644 --- a/packages/examples/src/utils.linescross.js +++ b/packages/examples/src/utils.linescross.js @@ -1,5 +1,4 @@ import freesewing from "freesewing"; -import { box } from "./shared"; var utilsLinesCross = { draft: function(part) {