AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix trace depth when widget is anchored middle or bottom

Browse source
This commit is contained in:
Stewart Allen 2021-03-30 09:57:02 -04:00
commit 614e5ca1c7
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/mode/cam/ops.js
View file

@ -713,7 +713,7 @@
slice(progress) { slice(progress) {
let { op, state } = this; let { op, state } = this;
let { tool, rate, down, plunge, offset } = op; 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 { updateToolDiams, cutTabs, cutPolys, healPolys } = state;
let { process, stock } = settings; let { process, stock } = settings;
let poly2polyEmit = BASE.util.poly2polyEmit; let poly2polyEmit = BASE.util.poly2polyEmit;
@ -760,7 +760,7 @@
.addPolys(slice.camLines) .addPolys(slice.camLines)
} }
function clearZ(polys, z, down) { 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); let nested = POLY.nest(polys);
for (let poly of nested) { for (let poly of nested) {
for (let z of zs) { for (let z of zs) {
@ -807,7 +807,7 @@
} }
for (let pi of poly) for (let pi of poly)
if (down) { 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)); followZ(pi.clone().setZ(z));
} }
} else { } else {

2
src/mode/cam/slice.js
View file

@ -36,6 +36,7 @@
zThru = zBottom === 0 ? (proc.camZThru || 0) : 0, zThru = zBottom === 0 ? (proc.camZThru || 0) : 0,
wztop = widget.track.top, wztop = widget.track.top,
ztOff = hasStock ? stock.z - wztop : 0, ztOff = hasStock ? stock.z - wztop : 0,
zTop = zMax + ztOff,
minToolDiam = Infinity, minToolDiam = Infinity,
maxToolDiam = -Infinity, maxToolDiam = -Infinity,
thruHoles, thruHoles,
@ -115,6 +116,7 @@
zThru, zThru,
ztOff, ztOff,
zMax, zMax,
zTop,
unsafe unsafe
}; };

4
web/kiri/index.css
View file

@ -772,8 +772,8 @@ th, tr, td, label {
right: 5px; right: 5px;
} }
#mod-setup { #mod-setup {
height: 500px; height: 550px;
width: 700px; width: 725px;
padding-bottom: 5px; padding-bottom: 5px;
} }
#mod-setup .header { #mod-setup .header {