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

patch lathe movements since no terrain is available

Browse source
This commit is contained in:
Stewart Allen 2023-02-14 21:19:39 -05:00
commit 2a7ee2fc67
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/kiri-mode/cam/prepare.js
View file

@ -64,20 +64,21 @@ function prepEach(widget, settings, print, firstPoint, update) {
let device = settings.device, let device = settings.device,
process = settings.process, process = settings.process,
stock = settings.stock || {},
outer = settings.bounds || widget.getPositionBox(),
outerz = outer.max.z,
slices = widget.slices,
isIndexed = process.camStockIndexed, isIndexed = process.camStockIndexed,
startCenter = process.camOriginCenter, startCenter = process.camOriginCenter,
alignTop = settings.controller.alignTop, alignTop = settings.controller.alignTop,
stock = settings.stock || {},
stockz = stock.z * (isIndexed ? 0.5 : 1),
outer = settings.bounds || widget.getPositionBox(),
outerz = outer.max.z,
slices = widget.slices,
zclear = (process.camZClearance || 1), zclear = (process.camZClearance || 1),
zmax_force = process.camForceZMax || false, zmax_force = process.camForceZMax || false,
zmax_outer = stock.z + zclear, zmax_outer = stockz + zclear,
wztop = widget.track.top, wztop = widget.track.top,
ztOff = stock.z - wztop, ztOff = stockz - wztop,
bounds = widget.getBoundingBox(), bounds = widget.getBoundingBox(),
boundsz = bounds.max.z + ztOff, boundsz = isIndexed ? stock.z / 2 : bounds.max.z + ztOff,
zadd = !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0, zadd = !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
zmax = outerz + zclear + process.camOriginOffZ, zmax = outerz + zclear + process.camOriginOffZ,
wmpos = widget.track.pos, wmpos = widget.track.pos,
@ -312,7 +313,8 @@ function prepEach(widget, settings, print, firstPoint, update) {
// before first point, move cutting head to point above it // before first point, move cutting head to point above it
// then set that new point as the lastPoint // then set that new point as the lastPoint
if (!lastPoint) { if (!lastPoint) {
let above = point.clone().setZ(zmax + zadd + ztOff); let above = point.clone().setZ(stockz + zclear);
// let above = point.clone().setZ(zmax + zadd + ztOff);
lastPoint = layerPush(above, 0, 0, tool.getNumber()); lastPoint = layerPush(above, 0, 0, tool.getNumber());
} }
@ -342,6 +344,12 @@ function prepEach(widget, settings, print, firstPoint, update) {
// new pos for plunge calc // new pos for plunge calc
deltaXY = 0; deltaXY = 0;
} }
} else if (isMove && currentOp.type === 'lathe') {
if (point.z > lastPoint.z) {
layerPush(lastPoint.clone().setZ(point.z), 0, 0, tool.getNumber());
} else if (point.z < lastPoint.z) {
layerPush(point.clone().setZ(lastPoint.z), 0, 0, tool.getNumber());
}
} else if (isMove) { } else if (isMove) {
// for longer moves, check the terrain to see if we need to go up and over // for longer moves, check the terrain to see if we need to go up and over
const bigXY = (deltaXY > moveLen && !lasering); const bigXY = (deltaXY > moveLen && !lasering);