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

better progress for complex cnc path routing

Browse source
This commit is contained in:
Stewart Allen 2021-12-14 22:26:58 -05:00
commit 07b730667b
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -353,6 +353,7 @@
newLayer();
}
let index = 0;
for (let slice of sliceOut) {
let polys = [], t = [], c = [];
POLY.flatten(slice.camLines).forEach(function (poly) {
@ -378,6 +379,7 @@
});
newLayer();
}
progress(++index / sliceOut.length, "routing");
}
function isNeg(v) {

8
src/mode/cam/prepare.js
View file

@ -28,13 +28,13 @@
let point;
widgets.forEach((widget, index) => {
point = prepEach(widget, settings, print, point, progress => {
update((index * weight + progress * weight) * 0.5, "prepare");
point = prepEach(widget, settings, print, point, (progress, msg) => {
update((index * weight + progress * weight) * 0.75, msg || "prepare");
});
});
print.render = KIRI.driver.FDM.prepareRender(print.output, (progress, layer) => {
update(0.5 + progress * 0.5, "render", layer);
update(0.75 + progress * 0.25, "render", layer);
}, {
thin: true,
print: 0,
@ -384,7 +384,7 @@
lastMode = op.op.type;
let weight = op.weight();
op.prepare(ops, (progress, message) => {
onupdate((opSum + (progress * weight)) / opTot, message || op.type());
update((opSum + (progress * weight)) / opTot, message || op.type(), message);
});
opSum += weight;
}