From f7cefc3c76b10e5f163c33dd718219a0f499d9b5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 30 Mar 2019 14:38:31 +0100 Subject: [PATCH] sparkles: First version of Carlton --- packages/carlton/config/index.js | 14 +++++--------- packages/carlton/index.html | 7 ++++--- packages/carlton/src/front.js | 9 +++++++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/carlton/config/index.js b/packages/carlton/config/index.js index 0701b73fced..8a96b97a95a 100644 --- a/packages/carlton/config/index.js +++ b/packages/carlton/config/index.js @@ -81,29 +81,26 @@ export default { sleeveBend: { deg: 10, min: 0, max: 20 }, sleevecapHeight: {pct: 45, min: 40, max: 60 }, sleevecapEase: { pct: 1, min: 0, max: 10 }, - sleeveLengthBonus: { pct: 0, min:-40, max: 10 }, - shoulderSlopeReduction: { pct: 2, min: 0, max: 5 }, - // FIXME: Are these used? + sleeveLengthBonus: { pct: 7, min: 0, max: 20 }, + shoulderSlopeReduction: { pct: 2, min: 1, max: 5 }, backNeckCutout: { pct: 5, min: 2, max: 8 }, frontArmholeDeeper: { pct: 0.5, min: 0, max: 1.5 }, // Carlton options waistEase: { pct: 14, min: 8, max: 25 }, seatEase: { pct: 14, min: 8, max: 25 }, - /** Length as a factor from waist to floor */ length: { pct: 69, min: 35, max: 100 }, - /** Horizontal button spacing as a percentage of the quarter waist */ buttonSpacingHorizontal: {pct: 43.5, min: 15, max: 60 }, frontOverlap: { pct: 1.5, min: 1, max: 2}, lapelReduction: { pct: 5, min: 0, max: 10 }, pocketPlacementHorizontal: {pct: 11, min: 5, max: 60 }, pocketPlacementVertical: {pct: 6, min: 5, max: 60 }, - pocketWidth: {pct: 95, min: 40, max: 60}, - pocketHeight: {pct: 15, min: 0, max: 80}, + pocketWidth: {pct: 95, min: 70, max: 120}, + pocketHeight: {pct: 15, min: 0, max: 40}, pocketRadius: {pct: 20, min: 0, max: 50}, pocketFlapRadius: {pct: 15, min: 0, max: 50}, chestPocketHeight: {pct: 60, min: 40, max: 80}, - chestPocketWidth: {pct: 25, min: 10, max: 50}, + chestPocketWidth: {pct: 25, min: 15, max: 50}, chestPocketPlacement: {pct: 55, min: 30, max: 65}, chestPocketAngle: {deg: 4, min: 0, max: 6}, @@ -117,6 +114,5 @@ export default { collarHeight: {pct: 9.6, min: 8, max: 11 }, collarSpread: {deg: 4, min: 2, max: 6 }, collarFlare: {pct: 20, min: 0, max: 40 }, - } }; diff --git a/packages/carlton/index.html b/packages/carlton/index.html index 4b34080e7a0..56f601f2624 100644 --- a/packages/carlton/index.html +++ b/packages/carlton/index.html @@ -35,8 +35,8 @@ //"hemStyle": "rounded", }, //"embed": true, - "sa": 0, - //"paperless": true, + "sa": 10, + "paperless": true, "measurements": { "bicepsCircumference": 350, "centerBackNeckToWaist": 560, @@ -55,10 +55,11 @@ "naturalWaistToSeat": 280, "seatCircumference": 1130 }, + //only: ["topSleeve"] }; var pattern = new freesewing.patterns.carlton(settings); pattern.use(freesewing.plugins.theme); - pattern.use(freesewing.plugins.designer); + //pattern.use(freesewing.plugins.designer); pattern.use(freesewing.plugins.validate); pattern.draft(); //pattern.sampleOption("collarFlare"); diff --git a/packages/carlton/src/front.js b/packages/carlton/src/front.js index 1b67e4a6b49..7b908f2d46f 100644 --- a/packages/carlton/src/front.js +++ b/packages/carlton/src/front.js @@ -289,6 +289,15 @@ export default function(part) { .close() .attr("class", "fabric help"); + paths.innerPocket = new Path() + .move(points.innerPocketTopLeft) + .line(points.innerPocketBottomLeft) + .line(points.innerPocketBottomRight) + .line(points.innerPocketTopRight) + .line(points.innerPocketTopLeft) + .close() + .attr("class", "fabric help"); + if (complete) { snippets.button1Left = new Snippet("button", points.button1Left).attr("data-scale", 2); snippets.button1Right = new Snippet("button", points.button1Right).attr("data-scale", 2);