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

err handling

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-27 02:14:14 +05:30
parent e7f0c259a2
commit 649b1ea3f1
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,23 +304,27 @@ module.exports = {
this.showGcodeMessage = true; this.showGcodeMessage = true;
while (this.showGcodeMessage) { while (this.showGcodeMessage) {
const toolpath = await api.get(`path/${file}`); try {
this.toolpath_progress = toolpath.progress; const toolpath = await api.get(`path/${file}`);
this.toolpath_progress = toolpath.progress;
if (toolpath.progress === 1 || typeof toolpath.progress == "undefined") { if (toolpath.progress === 1 || typeof toolpath.progress == "undefined") {
this.showGcodeMessage = false; this.showGcodeMessage = false;
if (toolpath.bounds) { if (toolpath.bounds) {
toolpath.filename = file; toolpath.filename = file;
this.toolpath_progress = 1; this.toolpath_progress = 1;
this.toolpath = toolpath; this.toolpath = toolpath;
const state = this.$root.state; const state = this.$root.state;
for (const axis of "xyzabc") { for (const axis of "xyzabc") {
Vue.set(state, `path_min_${axis}`, toolpath.bounds.min[axis]); Vue.set(state, `path_min_${axis}`, toolpath.bounds.min[axis]);
Vue.set(state, `path_max_${axis}`, toolpath.bounds.max[axis]); Vue.set(state, `path_max_${axis}`, toolpath.bounds.max[axis]);
}
} }
} }
} catch (error) {
console.error(error);
} }
} }
}, },
@@ -445,7 +449,9 @@ module.exports = {
delete_current: function () { delete_current: function () {
if (this.config.macros_list.find(item => item.file_name == this.state.selected) == undefined) { if (this.config.macros_list.find(item => item.file_name == this.state.selected) == undefined) {
if (this.state.selected) { if (this.state.selected) {
this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected); this.config.non_macros_list = this.config.non_macros_list.filter(
item => item.file_name != this.state.selected,
);
api.delete(`file/${this.state.selected}`); api.delete(`file/${this.state.selected}`);
} }
} else { } else {

4
src/pug/templates/control-view.pug
View File

@@ -22,9 +22,9 @@ script#control-view-template(type="text/x-template")
h3(slot="header") Run Macro? h3(slot="header") Run Macro?
div(slot="body") div(slot="body")
p p
| The macro file | The macro file
strong {{state.selected}} strong {{state.selected}}
| is being loaded. | is being loaded.
div(slot="footer") div(slot="footer")
button.pure-button(@click="macrosLoading=false") Cancel button.pure-button(@click="macrosLoading=false") Cancel