This commit is contained in:
Ross
2021-12-04 16:21:32 +00:00
parent a9d7155fb4
commit 6bc1da348b
2 changed files with 43 additions and 33 deletions
+19 -9
View File
@@ -22,7 +22,8 @@
{% for finding in series.findings.all %} {% for finding in series.findings.all %}
<div class="finding-box"> <div class="finding-box">
<button class="view-finding-button" data-annotationjson={{finding.annotation_json}} data-viewportjson={{finding.viewport_json}}>Click to view</button> <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
data-viewportjson={{finding.viewport_json}}>Click to view</button>
Finding(s): {{finding.findings.all|join:", "}}<br /> Finding(s): {{finding.findings.all|join:", "}}<br />
Structure(s): {{finding.structure.all|join:", "}}<br /> Structure(s): {{finding.structure.all|join:", "}}<br />
Description: {{finding.description}}<br /> Description: {{finding.description}}<br />
@@ -73,7 +74,7 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#add-finding-button").click(() => { $("#add-finding-button").click(() => {
dicom_element = $(".single-dicom-viewer").get(0); dicom_element = $(".cornerstone-element").get(0);
cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element); cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
cornerstone.reset(dicom_element); cornerstone.reset(dicom_element);
cornerstone.resize(dicom_element, true); cornerstone.resize(dicom_element, true);
@@ -83,7 +84,7 @@
}); });
$("#reset-viewport-button").click(() => { $("#reset-viewport-button").click(() => {
dicom_element = $(".single-dicom-viewer").get(0); dicom_element = $(".cornerstone-element").get(0);
//annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson); //annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element); cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
cornerstone.reset(dicom_element); cornerstone.reset(dicom_element);
@@ -93,10 +94,11 @@
$(".view-finding-button").each((n, el) => { $(".view-finding-button").each((n, el) => {
$(el).click((e) => { $(el).click((e) => {
dicom_element = $(".single-dicom-viewer").get(0); dicom_element = $(".cornerstone-element").get(0);
annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson); annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
viewport = JSON.parse(e.currentTarget.dataset.viewportjson); viewport = JSON.parse(e.currentTarget.dataset.viewportjson);
cornerstoneTools.globalImageIdSpecificToolStateManager.restoreToolState(annotationjson); cornerstoneTools.globalImageIdSpecificToolStateManager.restoreToolState(
annotationjson);
console.log(annotationjson) console.log(annotationjson)
//cornerstone.getEnabledElement(dicom_element).toolStateManager.restoreToolState(annotationjson) //cornerstone.getEnabledElement(dicom_element).toolStateManager.restoreToolState(annotationjson)
cornerstone.getEnabledElement(dicom_element).viewport = viewport cornerstone.getEnabledElement(dicom_element).viewport = viewport
@@ -109,7 +111,7 @@
}); });
$(document).on('submit', '#series_finding_form', function (e) { $(document).on('submit', '#series_finding_form', function (e) {
dicom_element = $(".single-dicom-viewer").get(0); dicom_element = $(".cornerstone-element").get(0);
c = cornerstone.getEnabledElement(dicom_element); c = cornerstone.getEnabledElement(dicom_element);
e.preventDefault(); e.preventDefault();
@@ -118,11 +120,19 @@
url: '{% url "atlas:add_finding" %}', url: '{% url "atlas:add_finding" %}',
data: { data: {
description: $('#id_description').val(), description: $('#id_description').val(),
series: {{series.pk}}, series: {
{
series.pk
}
},
//annotation_json: JSON.stringify(c.toolStateManager.saveToolState()), //annotation_json: JSON.stringify(c.toolStateManager.saveToolState()),
annotation_json: JSON.stringify(cornerstoneTools.globalImageIdSpecificToolStateManager.saveToolState()), annotation_json: JSON.stringify(cornerstoneTools.globalImageIdSpecificToolStateManager
.saveToolState()),
viewport_json: JSON.stringify(c.viewport), viewport_json: JSON.stringify(c.viewport),
findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected").map((i, el) => { return $(el).val() }).toArray()), findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected")
.map((i, el) => {
return $(el).val()
}).toArray()),
csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(), csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(),
action: 'post' action: 'post'
}, },
@@ -104,7 +104,7 @@
// send request to change the is_private state on customSwitches toggle // send request to change the is_private state on customSwitches toggle
$("#save-annotations").click(function () { $("#save-annotations").click(function () {
let el = $(".single-dicom-viewer").get(0); let el = $(".cornerstone-element").get(0);
let c = cornerstone.getEnabledElement(el); let c = cornerstone.getEnabledElement(el);