muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the issue where the UI becomes unresponsive on the first file upload

Browse Source
This commit is contained in:
David Carley
2021-03-02 18:42:34 -08:00
parent a0ae0a4e30
commit d752fd2b76
2 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/control-view.js
View File

@@ -511,15 +511,23 @@ module.exports = {
},
load_toolpath: function (file, file_time) {
load_toolpath: async function (file, file_time) {
this.toolpath = {};
if (!file) return;
api.get('path/' + file).done(function (toolpath) {
if (this.last_file_time != file_time) return;
this.showGcodeMessage = true;
let done;
while (!done) {
const toolpath = await api.get(`path/${file}`);
console.log("toolpath progress: ", toolpath.progress);
if (typeof toolpath.progress == 'undefined') {
console.log("done loading toolpath");
done = true;
toolpath.filename = file;
this.toolpath_progress = 1;
this.showGcodeMessage = false;
@@ -531,13 +539,11 @@ module.exports = {
Vue.set(state, 'path_min_' + axis, bounds.min[axis]);
Vue.set(state, 'path_max_' + axis, bounds.max[axis]);
}
} else {
this.showGcodeMessage = true;
console.log("Still loading toolpath");
this.toolpath_progress = toolpath.progress;
this.load_toolpath(file, file_time); // Try again
}
}.bind(this));
}
},