From b57e0e385c1008faa40ea0ee513584a39d511c26 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 6 Dec 2025 00:21:31 -0500 Subject: [PATCH] fix stock clear all --- src/kiri/mode/cam/cl-ops.js | 4 ++-- src/kiri/mode/cam/op-rough.js | 2 +- src/kiri/mode/cam/slice.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kiri/mode/cam/cl-ops.js b/src/kiri/mode/cam/cl-ops.js index 948d42d6..09c9cf89 100644 --- a/src/kiri/mode/cam/cl-ops.js +++ b/src/kiri/mode/cam/cl-ops.js @@ -244,8 +244,8 @@ export function createPopOps() { leave: UC.newInput(LANG.cr_lsto_s, { title: LANG.cr_lsto_l, convert: toFloat, units }), leavez: UC.newInput(LANG.cr_lstz_s, { title: LANG.cr_lstz_l, convert: toFloat, bound: UC.bound(0, 10), units }), sep: UC.newBlank({ class: "pop-sep" }), - all: UC.newBoolean(LANG.cr_clst_s, undefined, { title: LANG.cr_clst_l, show: hasIndexing }), - inside: UC.newBoolean(LANG.cr_olin_s, undefined, { title: LANG.cr_olin_l }), + all: UC.newBoolean(LANG.cr_clst_s, undefined, { title: LANG.cr_clst_l, show: () => !env.poppedRec.inside }), + inside: UC.newBoolean(LANG.cr_olin_s, undefined, { title: LANG.cr_olin_l, show: () => !env.poppedRec.all }), omitthru: UC.newBoolean(LANG.co_omit_s, undefined, { title: LANG.co_omit_l }), sep: UC.newBlank({ class: "pop-sep" }), exp: UC.newExpand("overrides"), diff --git a/src/kiri/mode/cam/op-rough.js b/src/kiri/mode/cam/op-rough.js index 39585bb1..601075b0 100644 --- a/src/kiri/mode/cam/op-rough.js +++ b/src/kiri/mode/cam/op-rough.js @@ -14,7 +14,7 @@ class OpRough extends CamOp { async slice(progress) { let { op, state } = this; - let { shadow, tool, widget } = state; + let { shadow, stock, tool, widget } = state; let { workarea } = state; let cutThruBypass = op.down > workarea.top_stock - workarea.bottom_part; diff --git a/src/kiri/mode/cam/slice.js b/src/kiri/mode/cam/slice.js index 96b92cdf..d63faa3e 100644 --- a/src/kiri/mode/cam/slice.js +++ b/src/kiri/mode/cam/slice.js @@ -160,6 +160,7 @@ export async function cam_slice(settings, widget, onupdate, ondone) { settings, shadowAt(z) { return widget.shadowAt(z) }, slicer, + stock, tabs, tool, unsafe,