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 z bottom offset when using imperial units

Browse source
This commit is contained in:
Stewart Allen 2020-10-15 11:59:00 -04:00
commit d54a6da12d
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/mode/cam/driver.js
View file

@ -401,6 +401,7 @@
maxX = bounds.max.x,// + diameter, maxX = bounds.max.x,// + diameter,
minY = bounds.min.y,// - diameter, minY = bounds.min.y,// - diameter,
maxY = bounds.max.y,// + diameter, maxY = bounds.max.y,// + diameter,
zBottom = outp.camZBottom * units,
boundsX = maxX - minX, boundsX = maxX - minX,
boundsY = maxY - minY, boundsY = maxY - minY,
maxangle = proc.camContourAngle, maxangle = proc.camContourAngle,
@ -471,7 +472,7 @@
gridy, gridy,
gridi, // index gridi, // index
gridv, // value gridv, // value
zMin = Math.max(bounds.min.z, outp.camZBottom) + 0.0001, zMin = Math.max(bounds.min.z, zBottom) + 0.0001,
x, y, tv, ltv; x, y, tv, ltv;
// for each Y slice, find z grid value (x/z swapped) // for each Y slice, find z grid value (x/z swapped)
@ -872,7 +873,7 @@
procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed, procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed,
procDrillReg = proc.camDrillReg, procDrillReg = proc.camDrillReg,
procTrace = proc.camTraceOn, procTrace = proc.camTraceOn,
sliceDepth = Math.max(0.1, Math.min(proc.camRoughDown, proc.camOutlineDown) / 3) * units, sliceDepth = Math.max(0.1, Math.min(proc.camRoughDown, proc.camOutlineDown) / 3 * units),
pocketOnlyRough = proc.camRoughPocket, pocketOnlyRough = proc.camRoughPocket,
pocketOnlyOutline = proc.camOutlinePocket, pocketOnlyOutline = proc.camOutlinePocket,
addTabsRough = procRough && proc.camTabsOn && !pocketOnlyRough, addTabsRough = procRough && proc.camTabsOn && !pocketOnlyRough,
@ -881,9 +882,12 @@
tabHeight = proc.camTabsHeight * units, tabHeight = proc.camTabsHeight * units,
bounds = widget.getBoundingBox(), bounds = widget.getBoundingBox(),
mesh = widget.mesh, mesh = widget.mesh,
zMin = Math.max(bounds.min.z, proc.camZBottom) * units, zBottom = proc.camZBottom * units,
zMin = Math.max(bounds.min.z, zBottom),
zThru = (proc.camZThru || 0) * units, zThru = (proc.camZThru || 0) * units,
ztoff = proc.camZTopOffset * units,
camRoughStock = proc.camRoughStock * units, camRoughStock = proc.camRoughStock * units,
camRoughDown = proc.camRoughDown * units,
shellRough, shellRough,
shellOutline, shellOutline,
facePolys, facePolys,
@ -1041,8 +1045,8 @@
// clear area from top of stock to top of part // clear area from top of stock to top of part
if (procFacing) { if (procFacing) {
let ztop = bounds.max.z, let ztop = bounds.max.z,
zpos = ztop + (proc.camZTopOffset * units), zpos = ztop + ztoff,
zstep = proc.camRoughDown * units; zstep = camRoughDown;
while (zpos >= ztop) { while (zpos >= ztop) {
zpos = zpos - Math.min(zstep, zpos - ztop); zpos = zpos - Math.min(zstep, zpos - ztop);
@ -1061,7 +1065,7 @@
if (procRough) { if (procRough) {
let selected = []; let selected = [];
selectSlices(slices, proc.camRoughDown * units, CPRO.ROUGH, selected); selectSlices(slices, camRoughDown, CPRO.ROUGH, selected);
if (zThru) { if (zThru) {
addZThru(selected); addZThru(selected);
} }
@ -1082,7 +1086,7 @@
} }
// horizontal slices for rough/outline // horizontal slices for rough/outline
doSlicing(widget, {height: sliceDepth, cam:true, zmin:proc.camZBottom, noEmpty:true}, camSlicesDone, function(update) { doSlicing(widget, {height:sliceDepth, cam:true, zmin:zBottom, noEmpty:true}, camSlicesDone, function(update) {
onupdate(0.0 + update * 0.25, "slicing"); onupdate(0.0 + update * 0.25, "slicing");
}); });
@ -1314,7 +1318,7 @@
alignTop = settings.controller.alignTop, alignTop = settings.controller.alignTop,
zclear = (process.camZClearance || 1) * units, zclear = (process.camZClearance || 1) * units,
zmax_outer = hasStock ? stock.z + zclear : outerz + zclear, zmax_outer = hasStock ? stock.z + zclear : outerz + zclear,
ztoff = process.camZTopOffset, ztoff = process.camZTopOffset * units,
zadd = hasStock ? stock.z - boundsz : alignTop ? outerz - boundsz : 0, zadd = hasStock ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
zmax = outerz + zclear, zmax = outerz + zclear,
wmpos = widget.mesh.position, wmpos = widget.mesh.position,