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

added for all tabs

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-10 02:28:05 +05:30
parent 1b98c6593b
commit 5d253ed441
2 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/macros.js
View File

@@ -12,7 +12,7 @@ module.exports = {
tab: "1", tab: "1",
confirmReset: false, confirmReset: false,
confirmSave: false, confirmSave: false,
newGcode: "", newGcode: ["", "", "", "", "", "", "", ""],
}; };
}, },
components: { components: {
@@ -35,7 +35,7 @@ module.exports = {
}, },
methods: { methods: {
updateNewGcode(event) { updateNewGcode(event) {
this.newGcode = event.target.value; this.newGcode[this.tab - 1] = event.target.value;
}, },
open: function () { open: function () {
utils.clickFileInput("gcode-file-input"); utils.clickFileInput("gcode-file-input");
@@ -45,7 +45,7 @@ module.exports = {
const file = this.state.selected; const file = this.state.selected;
this.$broadcast("gcode-load", file); this.$broadcast("gcode-load", file);
this.$broadcast("gcode-line", this.state.line); this.$broadcast("gcode-line", this.state.line);
this.newGCode = ""; this.newGCode[this.tab-1] = "";
}, },
upload: function (e) { upload: function (e) {
const files = e.target.files || e.dataTransfer.files; const files = e.target.files || e.dataTransfer.files;
@@ -76,19 +76,23 @@ module.exports = {
}); });
}, },
saveMacros: async function () { saveMacros: async function () {
var macrosName = document.getElementById(`macros-name-${this.tab-1}`).value; var macrosName = document.getElementById(
`macros-name-${this.tab - 1}`
).value;
var macrosColor = document.getElementById( var macrosColor = document.getElementById(
`macros-color-${this.tab-1}` `macros-color-${this.tab - 1}`
).value; ).value;
console.log(this.tab-1); console.log(this.tab - 1);
console.log(macrosColor, macrosName);
this.config.macros[this.tab-1].name = macrosName; this.config.macros[this.tab - 1].name = macrosName;
this.config.macros[this.tab-1].color = macrosColor; this.config.macros[this.tab - 1].color = macrosColor;
this.config.macros[this.tab-1].gcode_file_name = this.state.selected; this.config.macros[this.tab - 1].gcode_file_name = this.state.selected;
this.config.macros[this.tab-1].gcode_file_time = this.state.selected_time; this.config.macros[this.tab - 1].gcode_file_time =
this.state.selected_time;
console.log(this.config.macros); console.log(this.config.macros);
this.cancelMacros(this.tab-1); this.cancelMacros(this.tab - 1);
this.confirmSave = false; this.confirmSave = false;
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);
@@ -100,9 +104,9 @@ module.exports = {
} }
}, },
cancelMacros: function () { cancelMacros: function () {
document.getElementById(`macros-name-${this.tab-1}`).value = ""; document.getElementById(`macros-name-${this.tab - 1}`).value = "";
document.getElementById(`macros-color-${this.tab-1}`).value = "#ffffff"; document.getElementById(`macros-color-${this.tab - 1}`).value = "#ffffff";
document.getElementById(`gcodeSelect-${this.tab-1}`).value = "default"; document.getElementById(`gcodeSelect-${this.tab - 1}`).value = "default";
this.$broadcast("gcode-clear"); this.$broadcast("gcode-clear");
}, },
resetConfig: async function () { resetConfig: async function () {

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

@@ -93,7 +93,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-1(title="Select previously uploaded GCode programs.", select#gcodeSelect-1(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -105,7 +105,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode[tab-1]' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -122,7 +123,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-2(title="Select previously uploaded GCode programs.", select#gcodeSelect-2(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -134,7 +135,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -151,7 +153,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-3(title="Select previously uploaded GCode programs.", select#gcodeSelect-3(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -163,7 +165,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -180,7 +183,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-4(title="Select previously uploaded GCode programs.", select#gcodeSelect-4(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -192,7 +195,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -209,7 +213,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-5(title="Select previously uploaded GCode programs.", select#gcodeSelect-5(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -221,7 +225,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -238,7 +243,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-6(title="Select previously uploaded GCode programs.",selected select#gcodeSelect-6(title="Select previously uploaded GCode programs.",selected
v-model="state.selected",@change="load", :disabled="!is_ready", v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -250,7 +255,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",
@@ -267,7 +273,7 @@ script#macros-template(type="text/x-template")
select#gcodeSelect-7(title="Select previously uploaded GCode programs.",selected select#gcodeSelect-7(title="Select previously uploaded GCode programs.",selected
v-model="state.selected",@change="load", :disabled="!is_ready", v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px") style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option option(selected='' value='default') Create G-Code
option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open", button.pure-button(title="Upload a new GCode program.", @click="open",
@@ -279,7 +285,8 @@ script#macros-template(type="text/x-template")
accept=".nc,.ngc,.gcode,.gc") accept=".nc,.ngc,.gcode,.gc")
br br
.gcodeContainer .gcodeContainer
gcode-viewer textarea.new-gcode( v-if="state.selected=='default'",:value='newGcode' @input="updateNewGcode")
gcode-viewer(v-if="state.selected !== 'default'")
button.submit-macros(title="Save Macros",@click="confirmSave=true", button.submit-macros(title="Save Macros",@click="confirmSave=true",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros", button.submit-macros(title="Cancel Macros",@click="cancelMacros",