fix loading in some situations
This commit is contained in:
+11
-6
@@ -585,13 +585,14 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
|
|||||||
//});
|
//});
|
||||||
} else {
|
} else {
|
||||||
let url;
|
let url;
|
||||||
// This doesn't seem to have any benefit
|
// Cornerstone needs the whole url to load? (not relative)
|
||||||
//if (data_url.startsWith("http")) {
|
if (data_url.startsWith("http")) {
|
||||||
// url = data_url;
|
|
||||||
//} else {
|
|
||||||
// url = window.location.href.replace(/\/\#\/?$/, '') + "/" + data_url
|
|
||||||
//}
|
|
||||||
url = data_url;
|
url = data_url;
|
||||||
|
} else {
|
||||||
|
url = window.location.href.replace(/\/\#\/?$/, '').replace("index.html", "") + "/" + data_url
|
||||||
|
}
|
||||||
|
//url = data_url;
|
||||||
|
|
||||||
|
|
||||||
if (url.endsWith("dcm")) {
|
if (url.endsWith("dcm")) {
|
||||||
url = "wadouri:" + url;
|
url = "wadouri:" + url;
|
||||||
@@ -618,7 +619,11 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
|
|||||||
|
|
||||||
//console.log("LOAD and cache, then", image);
|
//console.log("LOAD and cache, then", image);
|
||||||
loadCornerstoneMainImage(element, image, stack, db, load_as_stack);
|
loadCornerstoneMainImage(element, image, stack, db, load_as_stack);
|
||||||
|
|
||||||
|
// We can only check dicom data if it exists (e.g. not on jpegs)
|
||||||
|
if (image.data != undefined) {
|
||||||
checkAnonStatus(image.data)
|
checkAnonStatus(image.data)
|
||||||
|
}
|
||||||
|
|
||||||
let load_annotation_image = true;
|
let load_annotation_image = true;
|
||||||
if (load_annotation_image) {
|
if (load_annotation_image) {
|
||||||
|
|||||||
Reference in New Issue
Block a user