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

removed selectedValues

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-28 22:04:11 +05:30
parent d3c5885538
commit 7f53f17447
3 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/js/macros.js
View File

@@ -14,7 +14,6 @@ module.exports = {
confirmSave: false, confirmSave: false,
deleteGCode: false, deleteGCode: false,
edited: false, edited: false,
selectedValues: ["default", "default", "default", "default", "default", "default", "default", "default"],
newGcode: ["", "", "", "", "", "", "", ""], newGcode: ["", "", "", "", "", "", "", ""],
}; };
}, },
@@ -41,10 +40,10 @@ module.exports = {
return this.config.macrosList.map(el => el.file_name); return this.config.macrosList.map(el => el.file_name);
}, },
getMacrosColor: function () { getMacrosColor: function () {
return this.config.macros[this.tab]["color"]; return this.config.macros[this.tab - 1]["color"];
}, },
getMacrosName: function () { getMacrosName: function () {
return this.config.macros[this.tab]["name"]; return this.config.macros[this.tab - 1]["name"];
}, },
}, },
methods: { methods: {
@@ -52,24 +51,24 @@ module.exports = {
utils.clickFileInput("gcode-file-input"); utils.clickFileInput("gcode-file-input");
}, },
updateNewGcode: function (event) { updateNewGcode: function (event) {
this.newGcode[this.tab] = event.target.value; this.newGcode[this.tab - 1] = event.target.value;
this.$dispatch("macros-edited"); this.$dispatch("macros-edited");
}, },
loadMacrosGcode: async function () { loadMacrosGcode: async function () {
const file = this.selectedValues[this.tab]; const file = this.config[this.tab - 1].file_name;
if (this.selectedValues[this.tab] != "default") { if (this.config[this.tab - 1].file_name != "default") {
const response = await fetch(`/api/file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${file}`, { const response = await fetch(`/api/file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${file}`, {
cache: "no-cache", cache: "no-cache",
}); });
console.log("response status: ", response.status); console.log("response status: ", response.status);
const text = (await response.text()).split(" ").join("\n"); const text = (await response.text()).split(" ").join("\n");
console.log("text: ", text); console.log("text: ", text);
this.$set("newGcode[this.tab]", text); this.$set("newGcode[this.tab-1]", text);
} else { } else {
this.$set("newGcode[this.tab]", ""); this.$set("newGcode[this.tab-1]", "");
} }
this.$dispatch("macros-edited"); this.$dispatch("macros-edited");
console.log("loaded GCode: ", this.newGcode[this.tab]); console.log("loaded GCode: ", this.newGcode[this.tab - 1]);
}, },
uploadMacrosGcode: async function (e) { uploadMacrosGcode: async function (e) {
const files = e.target.files || e.dataTransfer.files; const files = e.target.files || e.dataTransfer.files;
@@ -96,6 +95,7 @@ module.exports = {
}; };
if (!this.config.macrosList.some(item => item.file_name == file.name)) { if (!this.config.macrosList.some(item => item.file_name == file.name)) {
console.log("new gcode file for macros"); console.log("new gcode file for macros");
this.config.macros[this.tab - 1].file_name = file.name;
this.config.macrosList.push(gcodeData); this.config.macrosList.push(gcodeData);
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
@@ -107,8 +107,6 @@ module.exports = {
} else { } else {
console.log("Already exists"); console.log("Already exists");
} }
this.$set("selectedValues[this.tab]", file.name);
this.$dispatch("macros-edited"); this.$dispatch("macros-edited");
console.log("file.name", file.name); console.log("file.name", file.name);
console.log("file.name type: ", typeof file.name); console.log("file.name type: ", typeof file.name);
@@ -166,17 +164,18 @@ module.exports = {
var macrosColor = document.getElementById(`macros-color-${this.tab}`).value; var macrosColor = document.getElementById(`macros-color-${this.tab}`).value;
console.log(" this.state.selected && time: ", this.state.selected, this.state.selected_time); console.log(" this.state.selected && time: ", this.state.selected, this.state.selected_time);
console.log("selectedValues: ", this.selectedValues[this.tab]); console.log("selectedValues: ", this.config[this.tab - 1].file_name);
var file_name = this.selectedValues[this.tab] == "default" ? macrosName + ".ngc" : this.selectedValues[this.tab]; var file_name =
var file = this.newGcode[this.tab]; this.config[this.tab - 1].file_name == "default" ? macrosName + ".ngc" : this.config[this.tab - 1].file_name;
var file = this.newGcode[this.tab - 1];
this.uploadGCode(file_name, file); this.uploadGCode(file_name, file);
this.config.macros[this.tab].name = macrosName; this.config.macros[this.tab - 1].name = macrosName;
this.config.macros[this.tab].color = macrosColor; this.config.macros[this.tab - 1].color = macrosColor;
this.config.macros[this.tab].file_name = file_name; this.config.macros[this.tab - 1].file_name = file_name;
console.log("config.macros[this.tab - 1].file_name", this.config.macros[this.tab].file_name); console.log("config.macros[this.tab - 1].file_name", this.config.macros[this.tab - 1].file_name);
this.confirmSave = false; this.confirmSave = false;
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
@@ -189,30 +188,17 @@ module.exports = {
} }
}, },
delete_current: async function () { delete_current: async function () {
const filename = this.selectedValues[this.tab]; const filename = this.config.macros[this.tab - 1].file_name;
console.log("delete a gcode"); console.log("delete a gcode");
if (filename == "default") { if (filename == "default") {
this.$set("newGcode[this.tab]", ""); this.$set("newGcode[this.tab-1]", "");
this.$set("selectedValues[this.tab]", "default"); this.config.macros[this.tab - 1].file_name = "default";
} else { } else {
api.delete(`file/${filename}`); api.delete(`file/${filename}`);
this.$set("newGcode[this.tab]", ""); this.$set("newGcode[this.tab]", "");
this.$set("selectedValues[this.tab]", "default"); this.config.macros[this.tab - 1].file_name = "default";
this.config.macrosList = this.config.macrosList.filter(item => item.file_name !== filename); this.config.macrosList = this.config.macrosList.filter(item => item.file_name !== filename);
try {
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
} }
this.deleteGCode = false;
},
delete_all_macros: async function () {
const macrosList = this.config.macrosList.map(item => item.file_name).toString();
api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${macrosList}`);
this.config.macrosList = [];
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
this.$dispatch("update"); this.$dispatch("update");
@@ -220,56 +206,63 @@ module.exports = {
console.error("Restore Failed: ", error); console.error("Restore Failed: ", error);
alert("Restore failed"); alert("Restore failed");
} }
this.deleteGCode = false;
}, },
cancelMacros: function () { delete_all_macros: async function () {
const macrosList = this.config.macrosList.map(item => item.file_name).toString();
api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${macrosList}`);
this.config.macrosList = [];
},
cancelMacros: async function () {
console.log("this.tab", tab);
const defaultValue = this.config.macros[this.tab]; const defaultValue = this.config.macros[this.tab];
document.getElementById(`macros-name-${this.tab}`).value = defaultValue.name; document.getElementById(`macros-name-${this.tab}`).value = defaultValue.name;
document.getElementById(`macros-color-${this.tab}`).value = defaultValue.color; document.getElementById(`macros-color-${this.tab}`).value = defaultValue.color;
document.getElementById("gcode-field").value = ""; document.getElementById("gcode-field").value = "";
this.$set("newGcode[this.tab]", ""); this.$set("newGcode[this.tab]", "");
this.$set("selectedValues[this.tab]", "default"); this.config.macros[this.tab - 1].file_name = "default";
}, },
deleteAllMacros: async function () { deleteAllMacros: async function () {
this.config.macros = [ this.config.macros = [
{ {
name: "Macros 1", name: "Macros 1",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 2", name: "Macros 2",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 3", name: "Macros 3",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 4", name: "Macros 4",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 5", name: "Macros 5",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 6", name: "Macros 6",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 7", name: "Macros 7",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
{ {
name: "Macros 8", name: "Macros 8",
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}, },
]; ];
this.delete_all_macros(); this.delete_all_macros();
@@ -304,10 +297,9 @@ module.exports = {
const newMacros = { const newMacros = {
name: `Macros ${length + 1}`, name: `Macros ${length + 1}`,
color: "#dedede", color: "#dedede",
file_name: "", file_name: "default",
}; };
this.newGcode.push(""); this.newGcode.push("");
this.selectedValues.push("default");
this.config.macros.push(newMacros); this.config.macros.push(newMacros);
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);

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

@@ -47,7 +47,7 @@ script#macros-template(type="text/x-template")
p.title G-Code p.title G-Code
.flex-row-container .flex-row-container
select(:id="'gcodeSelect-'+index",title="Select previously uploaded GCode programs.",selected select(:id="'gcodeSelect-'+index",title="Select previously uploaded GCode programs.",selected
v-model="selectedValues[index]",@change="loadMacrosGcode", :disabled="!is_ready", v-model="config.macros[index].file_name",@change="loadMacrosGcode", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option( selected='' value='default') Create G-Code option( selected='' value='default') Create G-Code
option(v-for="file in macrosList", :value="file") {{file}} option(v-for="file in macrosList", :value="file") {{file}}
@@ -60,7 +60,7 @@ script#macros-template(type="text/x-template")
input(type="file", @change="uploadMacrosGcode", :disabled="!is_ready", input(type="file", @change="uploadMacrosGcode", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
button.blue-button(title="Delete Macros GCode",@click="deleteGCode = true", button.blue-button(title="Delete Macros GCode",@click="deleteGCode = true",
:disabled="!selectedValues[index]=='default'") Delete :disabled="!config.macros[index].file_name =='default'") Delete
.fa.fa-trash .fa.fa-trash
br br
.gcodeContainer .gcodeContainer

18
src/resources/config-template.json
View File

@@ -539,42 +539,42 @@
{ {
"name": "Macros 1", "name": "Macros 1",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 2", "name": "Macros 2",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 3", "name": "Macros 3",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 4", "name": "Macros 4",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 5", "name": "Macros 5",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 6", "name": "Macros 6",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 7", "name": "Macros 7",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
}, },
{ {
"name": "Macros 8", "name": "Macros 8",
"color": "#dedede", "color": "#dedede",
"file_name": "" "file_name": "default"
} }
], ],
"template": { "template": {
@@ -588,7 +588,7 @@
}, },
"file_name": { "file_name": {
"type": "string", "type": "string",
"default": "" "default": "default"
} }
} }
}, },