From debcf048fd8e38bcf857aabfb0c33c5436bdde74 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 24 Dec 2020 23:34:54 -0500 Subject: [PATCH] fix closed traces --- src/mode/cam/client.js | 2 +- src/mode/cam/ops.js | 2 +- src/mode/cam/prepare.js | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mode/cam/client.js b/src/mode/cam/client.js index 63aa5911..698ab075 100644 --- a/src/mode/cam/client.js +++ b/src/mode/cam/client.js @@ -687,7 +687,7 @@ sep: UC.newBlank({class:"pop-sep"}), spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}), down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}), - step: UC.newInput(LANG.cc_sovr_s, {title:LANG.cc_sovr_l, convert:UC.toFloat, bound:UC.bound(0.01,1.0)}), + step: UC.newInput(LANG.cc_sovr_s, {title:LANG.cc_sovr_l, convert:UC.toFloat, bound:UC.bound(0.01,1.0), show:() => popOp.outline.rec.wide}), rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}), plunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}), sep: UC.newBlank({class:"pop-sep"}), diff --git a/src/mode/cam/ops.js b/src/mode/cam/ops.js index 22e47324..a91fc5f5 100644 --- a/src/mode/cam/ops.js +++ b/src/mode/cam/ops.js @@ -276,7 +276,7 @@ }); slice.camLines = offset; - if (true) slice.output() + if (false) slice.output() .setLayer("slice", {line: 0xaaaa00}, true) .addPolys(slice.topPolys()) // .setLayer("top shadow", {line: 0x0000aa}) diff --git a/src/mode/cam/prepare.js b/src/mode/cam/prepare.js index 79ba1743..4488fd58 100644 --- a/src/mode/cam/prepare.js +++ b/src/mode/cam/prepare.js @@ -392,9 +392,10 @@ let traceTool = new CAM.Tool(settings, tool); let traceToolDiam = traceTool.fluteDiameter(); slice.camLines.forEach(poly => { - poly.forEachPoint(function(point, pidx) { - camOut(point.clone(), pidx > 0); - }, !poly.open); + let idx = 0, close = !poly.open; + poly.forEachPoint(point => { + camOut(point.clone(), idx++ > 0); + }, close); }); newLayer(); }