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

loggin everything

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-22 20:33:44 +05:30
parent d244b4c449
commit 1143b22f95
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,9 +204,10 @@ module.exports = {
}, },
gcodeFiles: function () { gcodeFiles: function () {
const filesWithNoMacros=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)); const filesWithNoMacros=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item));
console.log('filesWithNoMacros: ',filesWithNoMacros);
const unionSet = new Set([...filesWithNoMacros, ...this.config.gcodeList]); const unionSet = new Set([...filesWithNoMacros, ...this.config.gcodeList]);
const files = [...unionSet]; const files = [...unionSet];
console.log(files); console.log("files: ",files);
return files; return files;
} }
}, },
@@ -283,7 +284,7 @@ module.exports = {
return; return;
} }
console.log(file,file_time); console.log("file: ",file," time: ",file_time);
this.last_file = file; this.last_file = file;
this.last_file_time = file_time; this.last_file_time = file_time;

8
src/js/macros.js
View File

@@ -65,7 +65,7 @@ module.exports = {
} else { } else {
this.newGcode[this.tab - 1]=""; this.newGcode[this.tab - 1]="";
} }
console.log(this.newGcode[this.tab - 1]); console.log("newGcode: ",this.newGcode[this.tab - 1]);
}, },
upload:async function (e) { upload:async function (e) {
const files = e.target.files || e.dataTransfer.files; const files = e.target.files || e.dataTransfer.files;
@@ -159,8 +159,8 @@ module.exports = {
`macros-color-${this.tab - 1}` `macros-color-${this.tab - 1}`
).value; ).value;
console.log(this.state.selected, this.state.selected_time); console.log(" this.state.selected && time: ",this.state.selected, this.state.selected_time);
console.log(this.selectedValues[this.tab - 1]); console.log("selectedValues: ",this.selectedValues[this.tab - 1]);
if (this.state.selected == "default") { if (this.state.selected == "default") {
var file = this.newGcode[this.tab - 1]; var file = this.newGcode[this.tab - 1];
@@ -173,7 +173,7 @@ module.exports = {
this.state.selected == "default" ? macrosName+'.ngc' : this.state.selected; this.state.selected == "default" ? macrosName+'.ngc' : this.state.selected;
this.config.macros[this.tab - 1].gcode_file_time = this.config.macros[this.tab - 1].gcode_file_time =
this.state.selected_time; this.state.selected_time;
console.log(this.config.macros[this.tab - 1].gcode_file_name); console.log("config.macros[this.tab - 1].gcode_file_name",this.config.macros[this.tab - 1].gcode_file_name);
this.confirmSave = false; this.confirmSave = false;
try { try {
await api.put("config/save", this.config); await api.put("config/save", this.config);

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

@@ -289,10 +289,10 @@ script#control-view-template(type="text/x-template")
button.pure-button(@click="deleteGCode = false") Cancel button.pure-button(@click="deleteGCode = false") Cancel
button.pure-button.button-error(@click="delete_all") button.pure-button.button-error(@click="delete_all")
.fa.fa-trash .fa.fa-trash
|  all |  All
button.pure-button.button-success(@click="delete_current") button.pure-button.button-success(@click="delete_current")
.fa.fa-trash .fa.fa-trash
|  selected |  Selected
select(title="Select previously uploaded GCode programs.", select(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",

2
src/py/bbctrl/FileHandler.py
View File

@@ -38,7 +38,7 @@ class FileHandler(bbctrl.APIHandler):
def delete_ok(self, filename): def delete_ok(self, filename):
self.get_log('FileHandler').info('filename ' + filename) self.get_log('FileHandler').info('filename ' + filename)
allFiles = self.get_ctrl().state.return_files(filename) allFiles = self.get_ctrl().state.return_files()
for file in allFiles: for file in allFiles:
self.get_log('FileHandler').info('filename ' + file) self.get_log('FileHandler').info('filename ' + file)