From 614e5ca1c75b04ac9886e2469b981e73e3676dee Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 30 Mar 2021 09:57:02 -0400 Subject: [PATCH] fix trace depth when widget is anchored middle or bottom --- src/mode/cam/ops.js | 6 +++--- src/mode/cam/slice.js | 2 ++ web/kiri/index.css | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mode/cam/ops.js b/src/mode/cam/ops.js index 246e10ce..b0e6a3d0 100644 --- a/src/mode/cam/ops.js +++ b/src/mode/cam/ops.js @@ -713,7 +713,7 @@ slice(progress) { let { op, state } = this; let { tool, rate, down, plunge, offset } = op; - let { settings, widget, sliceAll, zMax, tabs } = state; + let { settings, widget, sliceAll, zMax, zTop, tabs } = state; let { updateToolDiams, cutTabs, cutPolys, healPolys } = state; let { process, stock } = settings; let poly2polyEmit = BASE.util.poly2polyEmit; @@ -760,7 +760,7 @@ .addPolys(slice.camLines) } function clearZ(polys, z, down) { - let zs = down ? BASE.util.lerp(zMax, z, down) : [ z ]; + let zs = down ? BASE.util.lerp(zTop, z, down) : [ z ]; let nested = POLY.nest(polys); for (let poly of nested) { for (let z of zs) { @@ -807,7 +807,7 @@ } for (let pi of poly) if (down) { - for (let z of BASE.util.lerp(zMax, pi.getZ(), down)) { + for (let z of BASE.util.lerp(zTop, pi.getZ(), down)) { followZ(pi.clone().setZ(z)); } } else { diff --git a/src/mode/cam/slice.js b/src/mode/cam/slice.js index da4689b2..79ef6939 100644 --- a/src/mode/cam/slice.js +++ b/src/mode/cam/slice.js @@ -36,6 +36,7 @@ zThru = zBottom === 0 ? (proc.camZThru || 0) : 0, wztop = widget.track.top, ztOff = hasStock ? stock.z - wztop : 0, + zTop = zMax + ztOff, minToolDiam = Infinity, maxToolDiam = -Infinity, thruHoles, @@ -115,6 +116,7 @@ zThru, ztOff, zMax, + zTop, unsafe }; diff --git a/web/kiri/index.css b/web/kiri/index.css index 58a7302b..30818c8d 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -772,8 +772,8 @@ th, tr, td, label { right: 5px; } #mod-setup { - height: 500px; - width: 700px; + height: 550px; + width: 725px; padding-bottom: 5px; } #mod-setup .header {