diff --git a/packages/simon/package-lock.json b/packages/simon/package-lock.json index 625481cc235..ba3cd8d9708 100644 --- a/packages/simon/package-lock.json +++ b/packages/simon/package-lock.json @@ -1290,26 +1290,21 @@ "dev": true }, "@freesewing/brian": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/@freesewing/brian/-/brian-0.22.0.tgz", - "integrity": "sha512-HUTZop9uFRITLgLks0mShnn2DLonAMc7EcIqg0SpYCxbOAndS9WemIx3mOqg1+OixzqE6TDe+k4HJifmd+K3/Q==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@freesewing/brian/-/brian-0.22.2.tgz", + "integrity": "sha512-oJggWuWfZVOujpimxGFEr/LpLYGDYkEIxKj9lYdnR8oTWFpv0VTKinIeZF+FztULtIhAhWgvQR/9a2uR3BLHcw==", "requires": { - "@freesewing/plugin-bundle": "0.6.0", - "freesewing": "^0.26.1" + "@freesewing/plugin-bundle": "^0.7.1", + "freesewing": "^0.27" }, "dependencies": { - "@freesewing/plugin-bundle": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.6.0.tgz", - "integrity": "sha512-gytm7G6CQtgi7wAxXe2ib8vwqak8DpMhR7v++fX418EgR16WBgxTVdglqLVQ8j/qF+W7QRbcS+jomCfU7FLxXQ==", + "freesewing": { + "version": "0.27.1", + "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.27.1.tgz", + "integrity": "sha512-pDKt156xjXAT2ScuWslbs24Oqmfm/lWFhmypQkscS6PSZIe0kztfgdg09Dm/cHIjt4ztf29c6XJD9AWNOFPmYw==", "requires": { - "@freesewing/plugin-cutonfold": "0.10.2", - "@freesewing/plugin-dimension": "0.7.3", - "@freesewing/plugin-grainline": "0.2.2", - "@freesewing/plugin-logo": "0.5.2", - "@freesewing/plugin-round": "0.2.0", - "@freesewing/plugin-scalebox": "0.3.1", - "@freesewing/plugin-title": "0.9.1" + "bezier-js": "^2.2.15", + "bin-pack": "1.0.2" } } } @@ -1416,11 +1411,6 @@ "integrity": "sha512-xpIPTZG1D79BNyhunMTc9ccbEkdh8S0YgNw0n40++R+/axsqFmg0hCWfoRDWWguyT3EYnwlkt4vB9DiQlhwgJQ==", "dev": true }, - "@freesewing/plugin-title": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@freesewing/plugin-title/-/plugin-title-0.9.1.tgz", - "integrity": "sha512-zsWJ3pXb/7bcgQqEEzSht5+jqZzzN80m1myRFKANqdxwi80ts81GWLhMgY9FlSHCVSvtwbLP4DAXz2bPDFoxKQ==" - }, "@freesewing/plugin-validate": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@freesewing/plugin-validate/-/plugin-validate-0.2.0.tgz", diff --git a/packages/simon/src/buttonholeplacket.js b/packages/simon/src/buttonholeplacket.js index 9267747f880..9005eeccbdb 100644 --- a/packages/simon/src/buttonholeplacket.js +++ b/packages/simon/src/buttonholeplacket.js @@ -28,7 +28,6 @@ export default part => { return part; } - console.log(options); for (let id of Object.keys(part.paths)) delete part.paths[id]; let width = options.buttonholePlacketWidth; let fold = options.buttonholePlacketFoldWidth; diff --git a/packages/simon/src/cuff-barrel-angled.js b/packages/simon/src/cuff-barrel-angled.js index c7c6fec6c22..ce3f22ee635 100644 --- a/packages/simon/src/cuff-barrel-angled.js +++ b/packages/simon/src/cuff-barrel-angled.js @@ -49,7 +49,6 @@ export default part => { // Paperless? if (paperless) { paperlessBarrelCuff(part); - console.log("trre", points.topRightRoundStart); macro("vd", { from: points.rightAngleBottom, to: points.rightAngleTop, diff --git a/packages/simon/src/cuff-barrel-rounded.js b/packages/simon/src/cuff-barrel-rounded.js index f0232c9c75b..1737ce169d3 100644 --- a/packages/simon/src/cuff-barrel-rounded.js +++ b/packages/simon/src/cuff-barrel-rounded.js @@ -69,7 +69,6 @@ export default part => { // Paperless? if (paperless) { paperlessBarrelCuff(part); - console.log("trre", points.topRightRoundStart); macro("vd", { from: points.topRightRoundStart, to: points.topRightRoundEnd, diff --git a/packages/simon/src/frontright.js b/packages/simon/src/frontright.js index 06a5996f06b..974c8eabf46 100644 --- a/packages/simon/src/frontright.js +++ b/packages/simon/src/frontright.js @@ -14,18 +14,19 @@ export default part => { paths } = part.shorthand(); macro("flip"); - points.scalebox = points.waist.shiftFractionTowards(points.cfWaist, 0.5); - macro("scalebox", { at: points.scalebox }); - - if (complete && paperless) { - frontDimensions(part, "right"); - macro("ld", { - from: points.shoulder, - to: points.neck, - d: 15 + sa - }); - paths.hemSa.attr("data-text-dy", 7, true); - paths.saFrench.attr("data-text-dy", 7, true); + if (complete) { + points.scalebox = points.waist.shiftFractionTowards(points.cfWaist, 0.5); + macro("scalebox", { at: points.scalebox }); + if (paperless) { + frontDimensions(part, "right"); + macro("ld", { + from: points.shoulder, + to: points.neck, + d: 15 + sa + }); + paths.hemSa.attr("data-text-dy", 7, true); + paths.saFrench.attr("data-text-dy", 7, true); + } } return options.buttonPlacketStyle === "seamless" diff --git a/packages/simon/src/shared.js b/packages/simon/src/shared.js index e287c6009a0..dab28b3d881 100644 --- a/packages/simon/src/shared.js +++ b/packages/simon/src/shared.js @@ -7,7 +7,6 @@ export const calculateReduction = function(part) { let hips = measurements.hipsCircumference * (1 + options.hipsEase); let waistReduction = chest - waist; let hipsReduction = chest - hips; - console.log("hipsEase", options.hipsEase, hips, hipsReduction); // If your waist > chest, this pattern is not going to work for you as-is. if (waistReduction < 0) waistReduction = 0;