From 80ba6b40e839a23b77dd6f4d8869e3df5c7bc4b6 Mon Sep 17 00:00:00 2001 From: Thomas Forgione Date: Fri, 22 Nov 2024 16:27:48 +0100 Subject: [PATCH] Clean --- src/nenuscanner/templates/calibrate.html | 24 ++++++++++++------------ src/nenuscanner/templates/scan.html | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/nenuscanner/templates/calibrate.html b/src/nenuscanner/templates/calibrate.html index b8cf3b5..60e4533 100644 --- a/src/nenuscanner/templates/calibrate.html +++ b/src/nenuscanner/templates/calibrate.html @@ -86,19 +86,19 @@ break; } - console.log(value); - let { status, id, ratio } = JSON.parse(value); - console.log(status, id, ratio); - progress = Math.ceil(1000 * parseFloat(ratio)); + for (let line of value.split('\n')) { + let { status, id, ratio } = JSON.parse(line); + progress = Math.ceil(1000 * parseFloat(ratio)); - if (status === "ready") { - let cell = document.createElement('div'); - cell.classList.add('cell'); - let img = document.createElement('img'); - img.classList.add('is-loading'); - img.src = '/data/calibrations/{{ calibration.id }}/' + id + '.jpg?v=' + scanIndex; - cell.appendChild(img); - grid.appendChild(cell); + if (status === "ready") { + let cell = document.createElement('div'); + cell.classList.add('cell'); + let img = document.createElement('img'); + img.classList.add('is-loading'); + img.src = '/data/calibrations/{{ calibration.id }}/' + id + '.jpg?v=' + scanIndex; + cell.appendChild(img); + grid.appendChild(cell); + } } } }); diff --git a/src/nenuscanner/templates/scan.html b/src/nenuscanner/templates/scan.html index 706af5c..8ca519e 100644 --- a/src/nenuscanner/templates/scan.html +++ b/src/nenuscanner/templates/scan.html @@ -156,17 +156,19 @@ continue; } - let { status, id, ratio } = JSON.parse(value); - progress = Math.ceil(1000 * parseFloat(ratio)); + for (let line of value.split('\n')) { + let { status, id, ratio } = JSON.parse(line); + progress = Math.ceil(1000 * parseFloat(ratio)); - if (status === "ready") { - let cell = document.createElement('div'); - cell.classList.add('cell'); - let img = document.createElement('img'); - img.classList.add('is-loading'); - img.src = '/data/objects/{{ object.id }}/' + acquisitionId + '/' + id + '.jpg?v=' + scanIndex; - cell.appendChild(img); - grid.appendChild(cell); + if (status === "ready") { + let cell = document.createElement('div'); + cell.classList.add('cell'); + let img = document.createElement('img'); + img.classList.add('is-loading'); + img.src = '/data/objects/{{ object.id }}/' + acquisitionId + '/' + id + '.jpg?v=' + scanIndex; + cell.appendChild(img); + grid.appendChild(cell); + } } } });