CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Created forceRedraw to deal with a timing issue when starting tracking.

Browse Source
This commit is contained in:
Juan Rosario
2021-08-26 18:00:40 -05:00
parent 5659365588
commit b078b141f1
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@@ -16,7 +16,7 @@
"@codemirror/state": "^0.19.1",
"@codemirror/stream-parser": "^0.19.1",
"@codemirror/view": "^0.19.1",
"@sindarius/gcodeviewer": "^2.0.4",
"@sindarius/gcodeviewer": "^2.0.5",
"axios": "^0.21.1",
"core-js": "^3.16.0",
"echarts": "^5.1.2",
@@ -1980,9 +1980,9 @@
"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
},
"node_modules/@sindarius/gcodeviewer": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-2.0.4.tgz",
"integrity": "sha512-+24Is5JZY2Zy9G/iuWp86w6TfvolVF3H4g2bgJoRe0zyabhSVAAXzQVkqDhJUSCpZCukYBvvCMOmHIuUVaZ/tQ==",
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-2.0.5.tgz",
"integrity": "sha512-VU3FDaw0nXX6FGeG0nQVtTm5Yv6q6OHxJFKP3yzpMkMrwlhDn7SpXR+9TaXRfw5FNAt5nnUKodqwNKbkPjF6Pw==",
"dependencies": {
"@babylonjs/core": "^4.2.0",
"@babylonjs/inspector": "^4.2.0",
@@ -21528,9 +21528,9 @@
"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
},
"@sindarius/gcodeviewer": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-2.0.4.tgz",
"integrity": "sha512-+24Is5JZY2Zy9G/iuWp86w6TfvolVF3H4g2bgJoRe0zyabhSVAAXzQVkqDhJUSCpZCukYBvvCMOmHIuUVaZ/tQ==",
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-2.0.5.tgz",
"integrity": "sha512-VU3FDaw0nXX6FGeG0nQVtTm5Yv6q6OHxJFKP3yzpMkMrwlhDn7SpXR+9TaXRfw5FNAt5nnUKodqwNKbkPjF6Pw==",
"requires": {
"@babylonjs/core": "^4.2.0",
"@babylonjs/inspector": "^4.2.0",

2
package.json
View File

@@ -22,7 +22,7 @@
"@codemirror/state": "^0.19.1",
"@codemirror/stream-parser": "^0.19.1",
"@codemirror/view": "^0.19.1",
"@sindarius/gcodeviewer": "^2.0.4",
"@sindarius/gcodeviewer": "^2.0.5",
"axios": "^0.21.1",
"core-js": "^3.16.0",
"echarts": "^5.1.2",

34
src/components/gcodeviewer/Viewer.vue
View File

@@ -221,14 +221,12 @@ export default class Viewer extends Mixins(BaseMixin) {
}
async loadFile(filename) {
fetch(filename).then((response) => {
response.text().then(async (text) => {
viewer.updateRenderQuality(this.renderQuality.value);
await viewer.processFile(text);
this.loadingPercent = 100;
this.finishLoad();
});
});
let response = await fetch(filename);
let text = await response.text();
viewer.updateRenderQuality(this.renderQuality.value);
await viewer.processFile(text);
this.loadingPercent = 100;
this.finishLoad();
}
async sleep(ms) {
@@ -314,15 +312,12 @@ export default class Viewer extends Mixins(BaseMixin) {
trackingBackup = newVal;
if (!viewer) return;
if (newVal) {
this.loadedFile = this.sdCardFilePath;
let fileToLoad = this.sdCardFilePath.replace('/home/pi/gcode_files/', '');
await this.loadFile(this.apiUrl + '/server/files/gcodes/' + encodeURI(fileToLoad));
//Force renderers reload.
viewer.gcodeProcessor.updateFilePosition(50000)
await this.sleep(2000);
viewer.gcodeProcessor.updateFilePosition(0);
viewer.gcodeProcessor.forceRedraw();
} else {
viewer.gcodeProcessor.setLiveTracking(false);
}
@@ -356,19 +351,18 @@ export default class Viewer extends Mixins(BaseMixin) {
}
}
loadToolColors(colors){
viewer.gcodeProcessor.resetTools();
for (var idx = 0; idx < colors.length; idx++) {
viewer.gcodeProcessor.addTool(colors[idx], 0.4); //Default the nozzle to 0.4 for now.
}
this.setReloadRequiredFlag();
loadToolColors(colors) {
viewer.gcodeProcessor.resetTools();
for (var idx = 0; idx < colors.length; idx++) {
viewer.gcodeProcessor.addTool(colors[idx], 0.4); //Default the nozzle to 0.4 for now.
}
this.setReloadRequiredFlag();
}
@Watch('extruderColors')
extruderColorsChanged(newVal) {
if (viewer && newVal) {
this.loadToolColors(newVal);
this.loadToolColors(newVal);
this.setReloadRequiredFlag();
}
}