This commit is contained in:
Ross
2021-11-12 14:13:51 +00:00
parent 9e5915bc34
commit aaa1a4ae18
+9 -2
View File
@@ -12,6 +12,8 @@
// set to hold the files that are still being processed // set to hold the files that are still being processed
let active_file_inputs = new Set(); let active_file_inputs = new Set();
let loading_viewer = false;
async function listAllFilesAndDirs(dirHandle, files_only) { async function listAllFilesAndDirs(dirHandle, files_only) {
const files = []; const files = [];
for await (let [name, handle] of dirHandle) { for await (let [name, handle] of dirHandle) {
@@ -538,6 +540,9 @@
console.log("active", active_file_inputs) console.log("active", active_file_inputs)
// Only load once all queued files have been processed // Only load once all queued files have been processed
if (active_file_inputs.size < 1) { if (active_file_inputs.size < 1) {
while (loading_viewer) {
}
loadViewer(); loadViewer();
} }
}); });
@@ -555,6 +560,7 @@
} }
function loadViewer() { function loadViewer() {
loading_viewer = true;
console.log("LOAD VIEWER") console.log("LOAD VIEWER")
// temp fix before starting viewer collapsed // temp fix before starting viewer collapsed
$("#single-dicom-viewer").show() $("#single-dicom-viewer").show()
@@ -576,13 +582,14 @@
"detail": image_set "detail": image_set
}); });
if (active_file_inputs.size < 1) {
window.dispatchEvent(event); window.dispatchEvent(event);
}
sortable('.sortable'); sortable('.sortable');
//sortable('.sortable')[0].addEventListener('sortstop', function(e) { //sortable('.sortable')[0].addEventListener('sortstop', function(e) {
updateImagePositions(); updateImagePositions();
//} //}
setTimeout(function () {
loading_viewer = false
}, 1000);
} }