From 6d28e75079a938e81c2b0901a7ba5753bcc23e96 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 9 Dec 2025 23:05:09 -0500 Subject: [PATCH] map omit void to omitinner --- src/kiri/core/conf.js | 1 + src/kiri/mode/cam/cl-ops.js | 2 ++ src/kiri/mode/cam/op-outline.js | 4 ++-- web/kiri/lang/en.js | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kiri/core/conf.js b/src/kiri/core/conf.js index b90bbc67..1182356e 100644 --- a/src/kiri/core/conf.js +++ b/src/kiri/core/conf.js @@ -537,6 +537,7 @@ export const conf = { camOutlineIn: false, camOutlineOut: true, camOutlineOmitThru: false, + camOutlineOmitVoid: false, camOutlineOver: 0.4, camOutlineOverCount: 1, camOutlinePlunge: 250, diff --git a/src/kiri/mode/cam/cl-ops.js b/src/kiri/mode/cam/cl-ops.js index 94631153..1f6e0426 100644 --- a/src/kiri/mode/cam/cl-ops.js +++ b/src/kiri/mode/cam/cl-ops.js @@ -265,6 +265,7 @@ export function createPopOps() { dogbones: 'camOutlineDogbone', revbones: 'camOutlineRevbone', omitthru: 'camOutlineOmitThru', + omitvoid: 'camOutlineOmitVoid', outside: 'camOutlineOut', inside: 'camOutlineIn', wide: 'camOutlineWide', @@ -284,6 +285,7 @@ export function createPopOps() { inside: UC.newBoolean(LANG.co_olin_s, undefined, { title: LANG.co_olin_l, show: (op) => { return !op.inputs.outside.checked } }), outside: UC.newBoolean(LANG.co_olot_s, undefined, { title: LANG.co_olot_l, show: (op) => { return !op.inputs.inside.checked } }), omitthru: UC.newBoolean(LANG.co_omit_s, undefined, { title: LANG.co_omit_l }), + omitvoid: UC.newBoolean(LANG.co_omvd_s, undefined, { title: LANG.co_omvd_l, xshow: (op) => { return op.inputs.outside.checked } }), sep: UC.newBlank({ class: "pop-sep" }), wide: UC.newBoolean(LANG.co_wide_s, undefined, { title: LANG.co_wide_l }), dogbones: UC.newBoolean(LANG.co_dogb_s, undefined, { title: LANG.co_dogb_l, show: (op) => { return !op.inputs.wide.checked } }), diff --git a/src/kiri/mode/cam/op-outline.js b/src/kiri/mode/cam/op-outline.js index e320dfef..eef485b8 100644 --- a/src/kiri/mode/cam/op-outline.js +++ b/src/kiri/mode/cam/op-outline.js @@ -14,7 +14,7 @@ class OpOutline extends CamOp { async slice(progress) { let { op, state } = this; - let { dogbones, down, inside, omitthru, outside, ov_botz, ov_topz } = op; + let { dogbones, down, inside, omitthru, omitvoid, outside, ov_botz, ov_topz } = op; let { plunge, rate, rename, revbones, spindle, tool } = op; let { shadow, widget } = state; @@ -55,7 +55,7 @@ class OpOutline extends CamOp { drape: true, expand: 0, mode: 'trace', - // omitinner: true, + omitinner: omitvoid, omitouter: inside, outline: omitthru, omitthru, diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index adfd0d45..6c891808 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -553,6 +553,8 @@ self.lang['en-us'] = { co_wide_l: ["widen outside cutout paths","for deep cuts in hard material"], co_omit_s: "omit through", co_omit_l: "eliminate thru holes", + co_omvd_s: "omit pocket", + co_omvd_l: "eliminate interior pockets", co_olen_s: "enable", co_olen_l: "enabled outline cutting", co_olin_s: "inside only",