From 856b5a60f192d16fe59e60573977ecc5994f691d Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 30 Oct 2021 10:27:01 +0100 Subject: [PATCH] . --- static/css/dicomViewer.css | 15 +++++++++++++++ static/js/dicomViewer.js | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/static/css/dicomViewer.css b/static/css/dicomViewer.css index 0100ea6c..b10e8d03 100644 --- a/static/css/dicomViewer.css +++ b/static/css/dicomViewer.css @@ -99,6 +99,21 @@ z-index: 999; } +#dicom-log-panel { + display: none; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + padding-left: 30px; + padding-right: 30px; + padding-bottom: 20px; + background-color: rgba(0, 0, 0, 0.8); /* Black w/ opacity */ + width: 90%; + height: 90%; + z-index: 999; +} + #dicom-window-panel { position: absolute; top: 100%; diff --git a/static/js/dicomViewer.js b/static/js/dicomViewer.js index 52913b4b..c431c251 100644 --- a/static/js/dicomViewer.js +++ b/static/js/dicomViewer.js @@ -24,10 +24,15 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l let single_dicom_viewer = main_element.find(".single-dicom-viewer").get(0); console.log(single_dicom_viewer); + $(".canvas-panel").append($(`
+ close +
`)); + // Add generic settings menus to canvas-panel $(".canvas-panel").append( $(`
close + view log

Image viewer settings:

Primary @@ -141,6 +146,15 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l $("#dicom-settings-panel").hide(); e.preventDefault(); }); + $("#dicom-log-close").click(e => { + $("#dicom-log-panel").hide(); + e.preventDefault(); + }); + $(".view-log-button").click(e => { + $("#dicom-settings-panel").hide(); + $("#dicom-log-panel").show(); + e.preventDefault(); + }); $("#dicom-settings-button").click(e => { $("#dicom-settings-panel").toggle(); }); @@ -272,14 +286,15 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l imageIds }; //cornerstone.loadAndCacheImage(imageIds[0]).then(function(image) { - console.log("load and cache", imageIds[0]) + //console.log("load and cache", imageIds[0]) cornerstone.loadAndCacheImage(imageIds[0]).then(function (image) { - console.log("LOAD and cache, then", image); + //console.log("LOAD and cache, then", image); loadCornerstoneMainImage(single_dicom_viewer, image, stack, db, load_as_stack); }) .catch((err, err2) => { console.log(err); + $("#dicom-log-panel").append(err); }); }