.
This commit is contained in:
@@ -75,15 +75,16 @@ $(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) => {
|
$(e.detail).each((n, el) => {
|
||||||
images.push($(el).attr("src"));
|
images.push($(el).attr("src"));
|
||||||
} );
|
});
|
||||||
//console.log("listen2", images)
|
//console.log("listen2", images)
|
||||||
loadDicomViewer(images); }, false);
|
loadDicomViewer(images);
|
||||||
|
}, false);
|
||||||
|
|
||||||
function loadDicomViewer(images_to_load) {
|
function loadDicomViewer(images_to_load) {
|
||||||
console.log("loadDicomViewer", images_to_load);
|
console.log("loadDicomViewer", images_to_load);
|
||||||
@@ -105,9 +106,15 @@ 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, true);
|
dicomViewer.loadCornerstone($(single_dicom), null, images, annotations, load_as_stack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -365,9 +372,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
window.create_popup_window = create_popup_window
|
window.create_popup_window = create_popup_window
|
||||||
@@ -792,8 +792,6 @@ def exam_scores_cid(request, pk):
|
|||||||
user_answers[cid].append("")
|
user_answers[cid].append("")
|
||||||
by_question[q].append(("", 0))
|
by_question[q].append(("", 0))
|
||||||
continue
|
continue
|
||||||
elif s.normal:
|
|
||||||
ans = "Normal"
|
|
||||||
else:
|
else:
|
||||||
ans = s.answer
|
ans = s.answer
|
||||||
answer_score = s.get_answer_score()
|
answer_score = s.get_answer_score()
|
||||||
|
|||||||
Reference in New Issue
Block a user