diff --git a/js/viewer.js b/js/viewer.js
index 8ca0fac..389817e 100644
--- a/js/viewer.js
+++ b/js/viewer.js
@@ -69,7 +69,7 @@ export function loadMainImage(image, stack) {
//element.scrollIntoView(false);
//element.scrollTo(0);
- $(element).dblclick(function () {
+ $(element).dblclick(function() {
if ($(".canvas-panel").length == 0) {
// already fullscreen (disable it)
disableFullscreen(this);
@@ -82,7 +82,7 @@ export function loadMainImage(image, stack) {
$(".dicom-select-control")
.get(0)
- .addEventListener("change", function () {
+ .addEventListener("change", function() {
changeControlSelection();
});
@@ -114,10 +114,10 @@ function onImageRendered(e) {
$("option[value=scroll").prop("hidden", false);
$("option[value=scroll").text(
"scroll (" +
- (stack.currentImageIdIndex + 1) +
- "/" +
- stack.imageIds.length +
- ")"
+ (stack.currentImageIdIndex + 1) +
+ "/" +
+ stack.imageIds.length +
+ ")"
);
// Temp way to enable CT window presets
@@ -566,6 +566,62 @@ export function keydown_handler(event) {
event.preventDefault();
}
+function loadAnnotation(imageId, annotation) {
+ const toolStateManager =
+ cornerstoneTools.globalImageIdSpecificToolStateManager;
+
+ if (annotation == undefined || annotation.length < 1) {
+ return;
+ }
+
+ let tool_state_no_id = JSON.parse(annotation);
+
+ let tool_state = {};
+ tool_state[imageId] = tool_state_no_id;
+
+ toolStateManager.restoreToolState(tool_state);
+}
+async function load(images, annotations) {
+ // Parallelize image preparation and annotation loading
+ const imageTasks = images.map(async (data_url, i) => {
+ const annotation = annotations[i];
+ let imageId;
+ if (data_url.startsWith("data:image")) {
+ imageId = "base64://" + data_url.split(",")[1];
+ } else if (data_url.startsWith("data:")) {
+ const dfile = await urltoFile(data_url, "dicom", "application/dicom");
+ imageId = cornerstoneWADOImageLoader.wadouri.fileManager.add(dfile);
+ } else {
+ let url = data_url;
+ if (url.endsWith("dcm")) {
+ url = "wadouri:" + url;
+ }
+ if (/(?:\/|^)[^.\/]+$/.test(url)) {
+ url = "wadouri:" + url;
+ }
+ imageId = url;
+ }
+ return {imageId, annotation};
+ });
+
+ // Wait for all image tasks to complete
+ const imageResults = await Promise.all(imageTasks);
+ const imageIds = imageResults.map(r => r.imageId);
+
+ // Display the first image as soon as possible
+ cornerstone.loadAndCacheImage(imageIds[0]).then(function(image) {
+ const stack = {
+ currentImageIdIndex: 0,
+ imageIds,
+ };
+ loadMainImage(image, stack);
+ // Restore annotations for all images after display
+ imageResults.forEach(({imageId, annotation}) => {
+ loadAnnotation(imageId, annotation);
+ });
+ });
+}
+
/**
* View cornstone image
* @param {*} t
@@ -576,82 +632,7 @@ export function openMainImage(current_question, t, source) {
* Load image
* @param {*} images - list of images
*/
- function loadAnnotation(imageId, annotation) {
- const toolStateManager =
- cornerstoneTools.globalImageIdSpecificToolStateManager;
- if (annotation == undefined || annotation.length < 1) {
- return;
- }
-
- let tool_state_no_id = JSON.parse(annotation);
-
- let tool_state = {};
- tool_state[imageId] = tool_state_no_id;
-
- toolStateManager.restoreToolState(tool_state);
- }
- async function load(images, annotations) {
- //console.debug("Load function", images)
- const imageIds = [];
- for (let i = 0; i < images.length; i++) {
- const data_url = images[i];
- const annotation = annotations[i];
-
- // check stack type
- if (data_url.startsWith("data:image")) {
- const imageId = "base64://" + data_url.split(",")[1];
-
- loadAnnotation(imageId, annotation);
-
- imageIds.push(imageId);
- //} else if (data_url.startsWith("data:application/dicom")) {
- } else if (data_url.startsWith("data:")) {
- // stack = stack.split(";")[1];
-
- const dfile = await urltoFile(data_url, "dicom", "application/dicom");
-
- const imageId = cornerstoneWADOImageLoader.wadouri.fileManager.add(
- dfile
- );
-
- loadAnnotation(imageId, annotation);
-
- imageIds.push(imageId);
- // cornerstone.loadImage(imageId).then(function(image) {
- // tempFunction(image);
- // });
- } else {
- let url = data_url;
- //if (data_url.startsWith("http")) {
- // url = data_url;
- //} else {
- // url = window.location.href.replace(/\/\#\/?$/, "") + "/" + data_url;
- //}
-
- if (url.endsWith("dcm")) {
- url = "wadouri:" + url;
- }
-
- // if there is no extension treat it as a dicom
- if (/(?:\/|^)[^.\/]+$/.test(url)) {
- url = "wadouri:" + url;
- }
- //console.debug(url)
-
- loadAnnotation(url, annotation);
-
- imageIds.push(url);
- }
- }
- const stack = {
- currentImageIdIndex: 0,
- imageIds,
- };
- cornerstone.loadAndCacheImage(imageIds[0]).then(function (image) {
- loadMainImage(image, stack);
- });
- }
if (current_question) {
// Check if the figure is already loaded (or if another one is)
@@ -680,44 +661,91 @@ export function openMainImage(current_question, t, source) {
source.className = "figure-open";
- console.log(current_question, figure_to_load, source);
let image_title = source.getElementsByClassName("figcaption")[0].textContent;
- $(".question").prepend(
- `
-
-
-
-
-
-
-
-
-