config to state
This commit is contained in:
@@ -205,8 +205,8 @@ 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);
|
console.log('filesWithNoMacros: ',filesWithNoMacros);
|
||||||
console.log("this.config.GCodeList",this.config.GCodeList)
|
console.log("this.config.GCodeList",this.state.GCodeList)
|
||||||
const unionSet = new Set([...filesWithNoMacros, ...this.config.GCodeList]);
|
const unionSet = new Set([...filesWithNoMacros, ...this.state.GCodeList]);
|
||||||
const files = [...unionSet];
|
const files = [...unionSet];
|
||||||
console.log("files: ",files);
|
console.log("files: ",files);
|
||||||
return files;
|
return files;
|
||||||
@@ -375,10 +375,10 @@ module.exports = {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const isAlreadyPresent = this.config.GCodeList.find((element) => element == file.name);
|
const isAlreadyPresent = this.state.GCodeList.find((element) => element == file.name);
|
||||||
if(isAlreadyPresent == undefined){
|
if(isAlreadyPresent == undefined){
|
||||||
console.log('new gcode file');
|
console.log('new gcode file');
|
||||||
this.config.GCodeList.push(file.name);
|
this.state.GCodeList.push(file.name);
|
||||||
try {
|
try {
|
||||||
await api.put("config/save", this.config);
|
await api.put("config/save", this.config);
|
||||||
this.$dispatch("update");
|
this.$dispatch("update");
|
||||||
|
|||||||
@@ -137,8 +137,8 @@ class State(object):
|
|||||||
|
|
||||||
def load_gcodes(self):
|
def load_gcodes(self):
|
||||||
GCodeList = []
|
GCodeList = []
|
||||||
files = copy.deepcopy(self.get('files'))
|
# files = copy.deepcopy(self.get('files'))
|
||||||
GCodeList=files
|
# GCodeList=files
|
||||||
self.set('GCodeList', GCodeList)
|
self.set('GCodeList', GCodeList)
|
||||||
|
|
||||||
def clear_files(self):
|
def clear_files(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user