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

make first part of slicing cancellable

Browse source
This commit is contained in:
Stewart Allen 2018-03-08 09:28:03 -05:00
commit 26bf2baf5e
6 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/kiri-work.js
View file

@ -165,13 +165,14 @@ if (self.window) {
},
cancel: function(data) {
// console.log({work_cancel: data});
if (data.id) {
var widget = cache[data.id];
if (widget) widget.cancel = true;
} else {
for (var id in cache) {
if (cache.hasOwnProperty(id)) cache[id].cancel = true;
if (cache.hasOwnProperty(id)) {
cache[id].cancel = true;
}
}
}
},
@ -188,8 +189,8 @@ if (self.window) {
last = util.time(),
now;
// clear previous widget data before reslice
delete cache[data.id];
// do it here so cancel can work
cache[data.id] = widget;
// fake mesh object to satisfy printing
widget.mesh = {
@ -199,6 +200,7 @@ if (self.window) {
widget.slice(settings, function(error) {
if (error) {
delete cache[data.id];
send.data({error: error});
} else {
var slices = widget.slices || [];
@ -215,7 +217,7 @@ if (self.window) {
}
send.done({done: true});
// cache results for future printing
cache[data.id] = widget;
// cache[data.id] = widget;
}, function(update, msg) {
now = util.time();
if (now - last < 10 && update < 0.99) return;