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

move to safe Z between ops

Browse source
This commit is contained in:
Stewart Allen 2022-12-10 22:29:54 -05:00
commit ed1f1ca45a
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/kiri-mode/cam/ops.js
View file

@ -138,13 +138,13 @@ class OpLevel extends CamOp {
prepare(ops, progress) { prepare(ops, progress) {
let { op, state, lines, stepOver } = this; let { op, state, lines, stepOver } = this;
let { setTool, setSpindle, printPoint } = ops; let { setTool, setSpindle, printPoint, setPrintPoint } = ops;
let { polyEmit, newLayer, tip2tipEmit, camOut } = ops; let { polyEmit, newLayer, tip2tipEmit, camOut } = ops;
setTool(op.tool, op.rate); setTool(op.tool, op.rate);
setSpindle(op.spindle); setSpindle(op.spindle);
lines = lines.map(p => { return { first: p.first(), last: p.last(), poly: p } }); lines = lines.map(p => { return { first: p.first(), last: p.last(), poly: p } });
tip2tipEmit(lines, printPoint, (el, point, count) => { printPoint = tip2tipEmit(lines, printPoint, (el, point, count) => {
let poly = el.poly; let poly = el.poly;
if (poly.last() === point) { if (poly.last() === point) {
poly.reverse(); poly.reverse();
@ -153,6 +153,7 @@ class OpLevel extends CamOp {
camOut(point.clone(), pidx > 0, stepOver); camOut(point.clone(), pidx > 0, stepOver);
}, false); }, false);
}); });
setPrintPoint(printPoint);
newLayer(); newLayer();
} }

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

@ -458,6 +458,11 @@ function prepEach(widget, settings, print, firstPoint, update) {
update((opSum + (progress * weight)) / opTot, message || op.type(), message); update((opSum + (progress * weight)) / opTot, message || op.type(), message);
}); });
opSum += weight; opSum += weight;
if (tool) {
newLayer();
camOut(printPoint = printPoint.clone().setZ(zmax + zadd + ztOff));
newLayer();
}
} }
function emitTrace(slice) { function emitTrace(slice) {