ross/dv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

navigate annotations

Browse Source
This commit is contained in:
Ross
2021-12-04 16:06:55 +00:00
parent db46c153f0
commit 67591e92e6
1 changed files with 148 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dicomViewer.js
+50 -37
View File
@@ -9,7 +9,7 @@ cornerstoneBase64ImageLoader.external.cornerstone = cornerstone;
cornerstoneWebImageLoader.external.cornerstone = cornerstone;
cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
cornerstoneTools.init({keyboardEnabled: true});
cornerstoneTools.init({ keyboardEnabled: true });
let tool_state = {};
@@ -314,7 +314,6 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
</div>
</div>`));
//console.log(cornerstone_element);
canvas_panel.append($(`<div id='dicom-log-panel'>
<span id="dicom-log-close" class="close-button"><a href="#">close</a></span>
@@ -421,8 +420,6 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
$("#dicom-window-panel button").each((n, el) => {
$(el).click((e) => {
//console.log(e);
//console.log(e.target);
let button_id = e.target.id;
let [ww, wc] = window_presets[button_id];
@@ -458,6 +455,13 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
$("#dicom-settings-panel").toggle();
});
$("#dicom-info-button").click(e => {
try {
// todo improve
dumpDataSet(cornerstone.getEnabledElement(element).image.data);
} catch {
console.log("unable to extract dicom data")
}
$("#dicom-summary-panel").toggle();
});
$("#dicom-fullscreen-button").click(e => {
@@ -501,7 +505,6 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
images = [images];
}
//console.log("Images", images)
//let annotations = [];
//if (annotations_to_load) {
@@ -514,11 +517,9 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
if (!Array.isArray(annotations)) {
annotations = [annotations];
}
//console.log("annon", annotations);
function loadAnnotation(imageId, annotation) {
//console.log("loadAnnotations", imageId, annotation);
const toolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager;
if (annotation == undefined || annotation.length < 1 || annotation == [undefined]) {
@@ -533,7 +534,6 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
}
async function load(images, annotations) {
console.log("LOAD", images);
let imageIds = [];
for (let i = 0; i < images.length; i++) {
let data_url = images[i];
@@ -597,11 +597,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])
cornerstone.loadAndCacheImage(imageIds[0]).then(function (image) {
//console.log("LOAD and cache, then", image);
loadCornerstoneMainImage(element, image, stack, db, load_as_stack);
let load_annotation_image = true;
if (load_annotation_image) {
getNextAnnotationImage(element)
}
})
.catch((err, err2) => {
console.log(err);
@@ -646,7 +650,6 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
let img;
//console.log("load thumb", image_url);
if (image_url.startsWith("data")) {
// based (image) data url, just load the image directly
@@ -708,14 +711,13 @@ export function loadCornerstone(main_element, db, images, annotations_to_load, l
load(images, annotations);
console.log(main_element)
main_element.keydown((evt) => { keyDownHandler(evt, element) });
main_element.keyup((evt) => { keyUpHandler(evt, element) });
main_element.keydown((evt) => { keyDownHandler(evt, element)});
main_element.keyup((evt) => { keyUpHandler(evt, element)});
}
function keyUpHandler(e, element) {
console.log("Key up", e, e.key)
if (e.key == "Control") {
registerPrimaryDicomInterface(element);
window.control_pressed = false;
@@ -731,7 +733,6 @@ function keyDownHandler(e, element) {
// return;
// }
//}
console.log("Key down", e, e.key)
if (e.key == "Control") {
if (window.control_pressed != true) {
@@ -744,13 +745,14 @@ function keyDownHandler(e, element) {
function numberKeyPressed(e, x) {
if (e.altKey ? true : false) {
selectThumb(x, element);
loadStackIndex(x, element);
e.preventDefault();
} else {}
} else { }
}
switch (charCode) {
case 13: // Return
getNextAnnotationImage(element);
if (e.shiftKey ? true : false) {
//$(".next-button:last").click();
} else {
@@ -826,9 +828,6 @@ function keyDownHandler(e, element) {
function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
//dumpDataSet(image.data)
//console.log("loadCornerstoneMainImage")
//console.log("load as stack:", load_as_stack)
// It is probably silly to do this each time we load a question
const PanTool = cornerstoneTools.PanTool;
const ZoomTool = cornerstoneTools.ZoomTool;
@@ -843,7 +842,6 @@ function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
const RectangleRoiTool = cornerstoneTools.RectangleRoiTool;
const LengthTool = cornerstoneTools.LengthTool;
//console.log("enable element", element);
cornerstone.enable(element);
element.tabIndex = 0;
@@ -869,8 +867,8 @@ function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, {
configuration: {
getTextCallback: () => {},
changeTextCallback: () => {},
getTextCallback: () => { },
changeTextCallback: () => { },
allowEmptyLabel: true,
renderDashed: false,
drawHandles: false,
@@ -888,7 +886,8 @@ function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
},
});
cornerstoneTools.setToolEnabledForElement(element, "ArrowAnnotate");
//cornerstoneTools.setToolEnabledForElement(element, "ArrowAnnotate");
//cornerstoneTools.setToolEnabledForElement(element, ArrowAnnotateTool);
let available_tools = [
@@ -922,7 +921,6 @@ function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
$("#primary-mouse-binding .mouse-binding-select[data-button=4]").val("Zoom");
//cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
//console.log(load_as_stack);
if (load_as_stack) {
cornerstoneTools.setToolActiveForElement(element, "StackScrollMouseWheel", {
mouseButtonMask: 3
@@ -972,7 +970,7 @@ function loadCornerstoneMainImage(element, image, stack, db, load_as_stack) {
resizeHandler(element);
window.addEventListener("resize", () => { resizeHandler(element)});
window.addEventListener("resize", () => { resizeHandler(element) });
element.addEventListener(
"contextmenu",
function (e) {
@@ -1027,14 +1025,6 @@ async function loadAltDicomInterface(db) {
// Called when the dicom image is loaded / rendered
function onImageRendered(e) {
const eventData = e.detail;
//console.log(e);
try {
// todo improve
dumpDataSet(eventData.image.data);
} catch {
console.log("unable to extract dicom data")
}
// Update ww/wl
$("#wc").text(Math.round(eventData.viewport.voi.windowCenter));
@@ -1070,7 +1060,7 @@ function stopEvent(evt) {
function selectThumbClick(evt, element) {
let new_index = evt.currentTarget.dataset.id;
selectThumb(new_index, element);
loadStackIndex(new_index, element);
evt.preventDefault();
}
@@ -1122,8 +1112,8 @@ function changeMouseBinding(evt, db, element) {
//db.mouse_bindings.put({button: button, mode: mode, tool: tool}).then(loadPrimaryDicomInterface());
}
export function selectThumb(new_index, dicom_element) {
//console.log("select thumb new index", new_index);
export function loadStackIndex(new_index, dicom_element) {
console.log("select new stack index", new_index);
// There must be a better way to do this...
if (dicom_element == null) {
return;
@@ -1184,3 +1174,26 @@ function dumpDataSet(dataSet) {
});
}
export function getNextAnnotationImage(element) {
const enabled_element = cornerstone.getEnabledElement(element)
const image_ids = enabled_element.toolStateManager.toolState.stack.data[0].imageIds;
const current_image = enabled_element.toolStateManager.toolState.stack.data[0].currentImageIdIndex;
const annotated_images = Object.getOwnPropertyNames(cornerstoneTools.globalImageIdSpecificToolStateManager.toolState);
console.log("getNextAnnotationImage", image_ids, current_image, annotated_images);
if (annotated_images.length > 0) {
let offset = current_image;
for( let i=0; i < image_ids.length; i++) {
console.log("i", i)
let pointer = (i + offset) % image_ids.length;
console.log("pointer", pointer, image_ids[pointer]);
console.log(annotated_images);
if (annotated_images.includes(image_ids[pointer])) {
console.log("load")
loadStackIndex(pointer, element);
}
}
}
}