From 16b147a2d872e8d460891ec656b18c9629042342 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Thu, 28 Jul 2022 14:54:25 +0000 Subject: [PATCH] Markings --- designs/octoplushy/src/eye.js | 2 +- designs/octoplushy/src/headSection.js | 5 ++- designs/octoplushy/src/legSection.js | 46 +++++++++++++++++++++++---- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/designs/octoplushy/src/eye.js b/designs/octoplushy/src/eye.js index f1f680e2592..15d815728bf 100644 --- a/designs/octoplushy/src/eye.js +++ b/designs/octoplushy/src/eye.js @@ -18,7 +18,7 @@ export default function (partNumber, part) { if (options.type != 'squid' && options.type != 'octopus') { return part } - if (partNumber > (options.type == 'squid' ? 2 : 3)) { + if (partNumber > (options.type == 'squid' ? 1 : 2)) { return part } diff --git a/designs/octoplushy/src/headSection.js b/designs/octoplushy/src/headSection.js index f553900d3a0..d5336009eef 100644 --- a/designs/octoplushy/src/headSection.js +++ b/designs/octoplushy/src/headSection.js @@ -422,7 +422,7 @@ export default function (partNumber, part) { .line(points.topLeft) .close() .attr('class', 'fabric') - .setRender(true) + .setRender(false) // Complete? if (complete) { @@ -502,6 +502,9 @@ export default function (partNumber, part) { .attr('data-text-class', 'center') .attr('class', 'hint dotted') } + points.sectionTop.attr('data-text', 'A').attr('data-text-class', 'center') + points.legTopLeft.attr('data-text', 'B').attr('data-text-class', 'center') + points.legTopRight.attr('data-text', 'B').attr('data-text-class', 'center') snippets.left = new Snippet('notch', points.sectionLeft) snippets.right = new Snippet('notch', points.sectionRight) diff --git a/designs/octoplushy/src/legSection.js b/designs/octoplushy/src/legSection.js index 1fbeadfe248..32e90513ed8 100644 --- a/designs/octoplushy/src/legSection.js +++ b/designs/octoplushy/src/legSection.js @@ -202,6 +202,10 @@ export default function (partNumber, part) { points.logo = points.legMiddle.shiftFractionTowards(points.legBottom, 0.08) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.4) + points.legMiddle.attr('data-text', 'C').attr('data-text-class', 'center') + points.legTopLeft.attr('data-text', 'D').attr('data-text-class', 'center') + points.legTopRight.attr('data-text', 'D').attr('data-text-class', 'center') + points.titleAnchor = points.legMiddle .shiftFractionTowards(points.legBottom, 0.2) .shift(180, sectionWidth * 0.1) @@ -248,16 +252,44 @@ export default function (partNumber, part) { .attr('class', 'hint dotted') } - // points.logo = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) - // snippets.logo = new Snippet('logo', points.logo) - // points.text = points.logo - // .shift(-90, w / 8) - // .attr('data-text', partNumber) - // .attr('data-text-class', 'center') - if (sa) { paths.sa = paths.section.offset(sa).attr('class', 'fabric sa') } + + if (paperless) { + // macro('hd', { + // from: points.topFin01, + // to: points.topFinRight, + // y: points.topFin01.y - sa - 10, + // }) + // macro('hd', { + // from: points.topFin03, + // to: points.topFinRight, + // y: points.topFin03.y + sa + 20, + // }) + // macro('hd', { + // from: points.topFinLeft, + // to: points.topFinRight, + // y: points.topFin03.y + sa + 10, + // }) + macro('vd', { + from: points.legMiddle, + to: points.legBottom, + x: points.legTopLeft.x - sa - 10, + }) + console.log( {legLength: points.legMiddle.dist( points.legBottom ) }) + // macro('vd', { + // from: points.topFin01, + // to: points.topFinInsideBottom, + // x: points.topFin02.x +sa + 10, + // }) + // macro('vd', { + // from: points.topFinInsideTop, + // to: points.topFin01, + // x: points.topFinLeft.x -sa - 20, + // }) + } + } return part