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

deleteselectedmacros

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-28 22:33:31 +05:30
parent 3b41347b4a
commit 7afedf5b0d
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/js/macros.js
View File

@@ -12,7 +12,7 @@ module.exports = {
tab: "1", tab: "1",
confirmReset: false, confirmReset: false,
confirmSave: false, confirmSave: false,
deleteSelected:false, deleteSelected: false,
deleteGCode: false, deleteGCode: false,
edited: false, edited: false,
newGcode: ["", "", "", "", "", "", "", ""], newGcode: ["", "", "", "", "", "", "", ""],
@@ -37,6 +37,9 @@ module.exports = {
is_ready: function () { is_ready: function () {
return this.mach_state == "READY"; return this.mach_state == "READY";
}, },
macrosLength: function () {
return this.config.macros.length > 0;
},
macrosList: function () { macrosList: function () {
return this.config.macrosList.map(el => el.file_name); return this.config.macrosList.map(el => el.file_name);
}, },
@@ -168,7 +171,9 @@ module.exports = {
console.log("selectedValues: ", this.config.macros[this.tab - 1].file_name); console.log("selectedValues: ", this.config.macros[this.tab - 1].file_name);
var file_name = var file_name =
this.config.macros[this.tab - 1].file_name == "default" ? macrosName + ".ngc" : this.config.macros[this.tab - 1].file_name; this.config.macros[this.tab - 1].file_name == "default"
? macrosName + ".ngc"
: this.config.macros[this.tab - 1].file_name;
var file = this.newGcode[this.tab - 1]; var file = this.newGcode[this.tab - 1];
this.uploadGCode(file_name, file); this.uploadGCode(file_name, file);
@@ -216,9 +221,9 @@ module.exports = {
}, },
cancelMacros: async function () { cancelMacros: async function () {
console.log("this.tab", this.tab); console.log("this.tab", this.tab);
const defaultValue = this.config.macros[this.tab]; const defaultValue = this.config.macros[this.tab - 1];
document.getElementById(`macros-name-${this.tab}`).value = defaultValue.name; document.getElementById(`macros-name-${this.tab - 1}`).value = defaultValue.name;
document.getElementById(`macros-color-${this.tab}`).value = defaultValue.color; document.getElementById(`macros-color-${this.tab - 1}`).value = defaultValue.color;
document.getElementById("gcode-field").value = ""; document.getElementById("gcode-field").value = "";
this.$set("newGcode[this.tab]", ""); this.$set("newGcode[this.tab]", "");
this.config.macros[this.tab - 1].file_name = "default"; this.config.macros[this.tab - 1].file_name = "default";
@@ -310,16 +315,15 @@ module.exports = {
alert("Restore failed"); alert("Restore failed");
} }
}, },
deleteSelectedMacros: async function(){ deleteSelectedMacros: async function () {
console.log("this.tab: ",this.tab); this.config.macros.splice(this.tab - 1, 1);
//this.config.macros.splice(this.tab, 1); try {
// try { await api.put("config/save", this.config);
// await api.put("config/save", this.config); this.$dispatch("update");
// this.$dispatch("update"); } catch (error) {
// } catch (error) { console.error("Restore Failed: ", error);
// console.error("Restore Failed: ", error); alert("Restore failed");
// alert("Restore failed"); }
// } },
}
}, },
}; };

2
src/pug/templates/macros.pug
View File

@@ -41,7 +41,7 @@ script#macros-template(type="text/x-template")
.flex-row-container .flex-row-container
button.config-button(title="Reset Macros", @click="confirmReset=true") Delete All button.config-button(title="Reset Macros", @click="confirmReset=true") Delete All
button.config-button(title="Add a Macros", @click="addNewMacros", style="margin-left:5px") New Macros button.config-button(title="Add a Macros", @click="addNewMacros", style="margin-left:5px") New Macros
button.config-button(title="Add a Macros", @click="deleteSelected=true", style="margin-left:5px") Delete Selected button.config-button(title="Add a Macros", @click="deleteSelected=true", style="margin-left:5px",:disabled="!macrosLength") Delete Selected
.tabs .tabs
template(v-for="(index,macros) in config.macros",:key="index+1") template(v-for="(index,macros) in config.macros",:key="index+1")

2
src/stylus/style.styl
View File

@@ -654,7 +654,7 @@ span.unit
.config-button .config-button
height 45px height 45px
margin-bottom 1rem margin-bottom 1rem
width 120px width 135px
border-radius 2px border-radius 2px
border 0 border 0
font-weight normal font-weight normal