vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2025-01-05 17:33:49 +01:00
Code Issues Projects Releases Wiki Activity

simplify progress updating

Browse Source 
by @companje
This commit is contained in:
casperlamboo 2018-01-25 12:13:11 +01:00
parent e09ed8012c
commit e091f425a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interface/utils.js
View File

@ -171,7 +171,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => { const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
updateProgress({ updateProgress({
action: progress.action, action: progress.action,
percentage: currentStep / steps + progress.done / progress.total / steps percentage: (currentStep + progress.done / progress.total) / steps
}); });
}).catch(error => { }).catch(error => {
throw { message: `error during slicing: ${error.message}`, code: 2 }; throw { message: `error during slicing: ${error.message}`, code: 2 };
@ -204,7 +204,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => { await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => {
updateProgress({ updateProgress({
action: 'Uploading', action: 'Uploading',
percentage: currentStep / steps + progress.loaded / progress.total / steps percentage: (currentStep + progress.loaded / progress.total) / steps
}); });
}); });
clearInterval(interval); clearInterval(interval);
@ -235,7 +235,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => { await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
updateProgress({ updateProgress({
action: 'Uploading', action: 'Uploading',
percentage: currentStep / steps + progress.loaded / progress.total / steps percentage: (currentStep + progress.loaded / progress.total) / steps
}); });
}); });
currentStep ++; currentStep ++;