VSinerva/freesewing
1
0
Fork 0
Code Activity

bug: Only add scalebox when complete is true

Browse source
This commit is contained in:
Joost De Cock 2018-12-29 13:38:43 +01:00
parent 36e1901c1f
commit fefb660c59
6 changed files with 24 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

32
packages/simon/package-lock.json generated
View file

@ -1290,26 +1290,21 @@
"dev": true "dev": true
}, },
"@freesewing/brian": { "@freesewing/brian": {
"version": "0.22.0", "version": "0.22.2",
"resolved": "https://registry.npmjs.org/@freesewing/brian/-/brian-0.22.0.tgz", "resolved": "https://registry.npmjs.org/@freesewing/brian/-/brian-0.22.2.tgz",
"integrity": "sha512-HUTZop9uFRITLgLks0mShnn2DLonAMc7EcIqg0SpYCxbOAndS9WemIx3mOqg1+OixzqE6TDe+k4HJifmd+K3/Q==", "integrity": "sha512-oJggWuWfZVOujpimxGFEr/LpLYGDYkEIxKj9lYdnR8oTWFpv0VTKinIeZF+FztULtIhAhWgvQR/9a2uR3BLHcw==",
"requires": { "requires": {
"@freesewing/plugin-bundle": "0.6.0", "@freesewing/plugin-bundle": "^0.7.1",
"freesewing": "^0.26.1" "freesewing": "^0.27"
}, },
"dependencies": { "dependencies": {
"@freesewing/plugin-bundle": { "freesewing": {
"version": "0.6.0", "version": "0.27.1",
"resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.6.0.tgz", "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.27.1.tgz",
"integrity": "sha512-gytm7G6CQtgi7wAxXe2ib8vwqak8DpMhR7v++fX418EgR16WBgxTVdglqLVQ8j/qF+W7QRbcS+jomCfU7FLxXQ==", "integrity": "sha512-pDKt156xjXAT2ScuWslbs24Oqmfm/lWFhmypQkscS6PSZIe0kztfgdg09Dm/cHIjt4ztf29c6XJD9AWNOFPmYw==",
"requires": { "requires": {
"@freesewing/plugin-cutonfold": "0.10.2", "bezier-js": "^2.2.15",
"@freesewing/plugin-dimension": "0.7.3", "bin-pack": "1.0.2"
"@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"
} }
} }
} }
@ -1416,11 +1411,6 @@
"integrity": "sha512-xpIPTZG1D79BNyhunMTc9ccbEkdh8S0YgNw0n40++R+/axsqFmg0hCWfoRDWWguyT3EYnwlkt4vB9DiQlhwgJQ==", "integrity": "sha512-xpIPTZG1D79BNyhunMTc9ccbEkdh8S0YgNw0n40++R+/axsqFmg0hCWfoRDWWguyT3EYnwlkt4vB9DiQlhwgJQ==",
"dev": true "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": { "@freesewing/plugin-validate": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/@freesewing/plugin-validate/-/plugin-validate-0.2.0.tgz", "resolved": "https://registry.npmjs.org/@freesewing/plugin-validate/-/plugin-validate-0.2.0.tgz",

1
packages/simon/src/buttonholeplacket.js
View file

@ -28,7 +28,6 @@ export default part => {
return part; return part;
} }
console.log(options);
for (let id of Object.keys(part.paths)) delete part.paths[id]; for (let id of Object.keys(part.paths)) delete part.paths[id];
let width = options.buttonholePlacketWidth; let width = options.buttonholePlacketWidth;
let fold = options.buttonholePlacketFoldWidth; let fold = options.buttonholePlacketFoldWidth;

1
packages/simon/src/cuff-barrel-angled.js
View file

@ -49,7 +49,6 @@ export default part => {
// Paperless? // Paperless?
if (paperless) { if (paperless) {
paperlessBarrelCuff(part); paperlessBarrelCuff(part);
console.log("trre", points.topRightRoundStart);
macro("vd", { macro("vd", {
from: points.rightAngleBottom, from: points.rightAngleBottom,
to: points.rightAngleTop, to: points.rightAngleTop,

1
packages/simon/src/cuff-barrel-rounded.js
View file

@ -69,7 +69,6 @@ export default part => {
// Paperless? // Paperless?
if (paperless) { if (paperless) {
paperlessBarrelCuff(part); paperlessBarrelCuff(part);
console.log("trre", points.topRightRoundStart);
macro("vd", { macro("vd", {
from: points.topRightRoundStart, from: points.topRightRoundStart,
to: points.topRightRoundEnd, to: points.topRightRoundEnd,

5
packages/simon/src/frontright.js
View file

@ -14,10 +14,10 @@ export default part => {
paths paths
} = part.shorthand(); } = part.shorthand();
macro("flip"); macro("flip");
if (complete) {
points.scalebox = points.waist.shiftFractionTowards(points.cfWaist, 0.5); points.scalebox = points.waist.shiftFractionTowards(points.cfWaist, 0.5);
macro("scalebox", { at: points.scalebox }); macro("scalebox", { at: points.scalebox });
if (paperless) {
if (complete && paperless) {
frontDimensions(part, "right"); frontDimensions(part, "right");
macro("ld", { macro("ld", {
from: points.shoulder, from: points.shoulder,
@ -27,6 +27,7 @@ export default part => {
paths.hemSa.attr("data-text-dy", 7, true); paths.hemSa.attr("data-text-dy", 7, true);
paths.saFrench.attr("data-text-dy", 7, true); paths.saFrench.attr("data-text-dy", 7, true);
} }
}
return options.buttonPlacketStyle === "seamless" return options.buttonPlacketStyle === "seamless"
? frontRightSeamless(part) ? frontRightSeamless(part)

1
packages/simon/src/shared.js
View file

@ -7,7 +7,6 @@ export const calculateReduction = function(part) {
let hips = measurements.hipsCircumference * (1 + options.hipsEase); let hips = measurements.hipsCircumference * (1 + options.hipsEase);
let waistReduction = chest - waist; let waistReduction = chest - waist;
let hipsReduction = chest - hips; 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 your waist > chest, this pattern is not going to work for you as-is.
if (waistReduction < 0) waistReduction = 0; if (waistReduction < 0) waistReduction = 0;