From 43fdeef1a15b28a61a6c36e7098849bfb0b7284d Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 3 Jul 2024 18:30:50 -0400 Subject: [PATCH] fix double-offsetting of pocket contour expansion --- src/kiri-mode/cam/ops.js | 7 +++---- web/kiri/lang/en.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js index 8eb28db9..85534372 100644 --- a/src/kiri-mode/cam/ops.js +++ b/src/kiri-mode/cam/ops.js @@ -1227,9 +1227,6 @@ class OpPocket extends CamOp { if (contour) { expand = engrave ? 0 : expand; } - if (expand) { - polys = POLY.offset(polys, expand); - } let zpro = 0, zinc = 1 / (polys.length * zs.length); for (let poly of polys) { for (let z of zs) { @@ -1254,7 +1251,9 @@ class OpPocket extends CamOp { let count = engrave ? 1 : 999; slice.camTrace = { tool, rate, plunge }; if (toolDiam) { - const offs = contour ? [ expand ? expand : -0.02, -toolOver ] : [ -toolDiam / 2, -toolOver ]; + const offs = contour ? + [ expand || (-0.02), -toolOver ] : + [ expand || (-toolDiam / 2), -toolOver ]; POLY.offset(clip, offs, { count, outs: slice.camLines = [], flat:true, z }); diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 54ce6b53..3f936a5f 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -556,7 +556,7 @@ self.kiri.lang['en-us'] = { // CNC POCKET cp_xpnd_s: "expand", - cp_xpnd_l: ["grow selected area to","encompass corners"], + cp_xpnd_l: ["grow (+) or shrink (-) selected areas","contour uses entire selected area","non-contour defaults to tool radius","in workspace units"], cp_smoo_s: "smooth", cp_smoo_l: ["clean up jagged edges caused by angled walls. can speedup and improve pocketing for detailed geometries. recommend starting with values around 1 if slicing takes too long or the contours look jagged"], cp_foll_s: "selection",