This commit is contained in:
Ross
2021-02-17 11:02:08 +00:00
parent 4d873b6e91
commit d39cb35107
+9 -16
View File
@@ -76,15 +76,14 @@ $(document).ready(function () {
window.loadDicomViewerEvent = new Event('loadDicomViewer'); window.loadDicomViewerEvent = new Event('loadDicomViewer');
window.addEventListener('loadDicomViewer', function (e) { window.addEventListener('loadDicomViewer', function (e) {
//console.log("listen", e.detail) console.log("listen", e.detail)
let images = []; let images = [];
//console.log($("#image_form_set img")); console.log($("#image_form_set img"));
$(e.detail).each((n, el) => { $("#image_form_set img").each((n, el) => {
images.push($(el).attr("src")); images.push($(el).attr("src"));
}); } );
//console.log("listen2", images) console.log("listen2", images)
loadDicomViewer(images); loadDicomViewer(images); }, false);
}, false);
function loadDicomViewer(images_to_load) { function loadDicomViewer(images_to_load) {
console.log("loadDicomViewer", images_to_load); console.log("loadDicomViewer", images_to_load);
@@ -106,15 +105,9 @@ function loadDicomViewer(images_to_load) {
if (annotations != undefined && annotations.indexOf(",") > 0) { if (annotations != undefined && annotations.indexOf(",") > 0) {
annotations = annotations; annotations = annotations;
} }
let load_as_stack;
if (images.length > 5) {
load_as_stack = true;
} else {
load_as_stack = false;
}
if (images) { if (images) {
dicomViewer.loadCornerstone($(single_dicom), null, images, annotations, load_as_stack); dicomViewer.loadCornerstone($(single_dicom), null, images, annotations, true);
} }
} }
} }
@@ -372,8 +365,8 @@ function keyDownHandler(e) {
function create_popup_window(url, title) { function create_popup_window(url, title) {
newwindow = window.open(url, title, 'height=800,width=600'); newwindow=window.open(url,title,'height=800,width=600');
if (window.focus) { newwindow.focus() } if (window.focus) {newwindow.focus()}
return false; return false;
} }