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

improve vivas

Browse Source
This commit is contained in:
Ross
2025-06-30 12:58:32 +01:00
parent 153045a3e4
commit 8229813eba
6 changed files with 142 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/models.py
+1 -1
View File
@@ -1147,7 +1147,7 @@ class CaseDetail(models.Model):
return None return None
def default_viewerstate_string(self): def default_viewerstate_string(self):
return json.dumps(self.default_viewerstate) if self.default_viewerstate else "" return json.dumps(self.default_viewerstate) if self.default_viewerstate else "{}"
class CasePrior(models.Model): class CasePrior(models.Model):
case_detail = models.ForeignKey(CaseDetail, on_delete=models.CASCADE) case_detail = models.ForeignKey(CaseDetail, on_delete=models.CASCADE)
atlas/templates/atlas/collection_detail.html
+5 -1
View File
@@ -18,7 +18,11 @@
<li data-question_pk={{casedetail.case.pk}}><a title="sort_order: {{casedetail.sort_order}}" href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a> <li data-question_pk={{casedetail.case.pk}}><a title="sort_order: {{casedetail.sort_order}}" href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
: {{casedetail.case.title}} : {{casedetail.case.title}}
(<a href="{% url 'atlas:collection_case_display_setup' casedetail.collection.pk casedetail.case.pk %}">setup default display</a>) (<a href="{% url 'atlas:collection_case_display_setup' casedetail.collection.pk casedetail.case.pk %}">setup default display</a>
{% if casedetail.default_viewerstate %}
<i class="bi bi-check text-success" title="This case has a default viewerstate defined"></i>
{% endif %}
)
{% if collection.collection_type == "QUE" %} {% if collection.collection_type == "QUE" %}
(<a href='{% url "atlas:collection_case_details" casedetail.collection.pk casedetail.case.pk %}'>edit questions</a> (<a href='{% url "atlas:collection_case_details" casedetail.collection.pk casedetail.case.pk %}'>edit questions</a>
atlas/templates/atlas/collection_viva.html
+66 -61
View File
@@ -10,9 +10,9 @@
<p>It is also possible to open a single series by clicking on the 'Load' button next to the individual series.</p> <p>It is also possible to open a single series by clicking on the 'Load' button next to the individual series.</p>
<p>Once opened the case details will be show on the right hand side of the page.</p> <p>Once opened the case details will be show on the right hand side of the page.</p>
<div class="mb-2"> <div class="mb-2">
<button id="toggle-load-mode" class="btn btn-secondary">Switch to Load OHIF</button> <button id="toggle-load-mode" class="btn btn-secondary">Switch to Load OHIF</button>
</div> </div>
</details> </details>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -22,48 +22,49 @@
<button id="open-viewer-local" >Open Viewer Local</button> <button id="open-viewer-local" >Open Viewer Local</button>
<button id="view-series" class="text-dark border-dark" >Toggle series</button> <button id="view-series" class="text-dark border-dark" >Toggle series</button>
<ol id="" class="sortable"> <ol id="" class="sortable">
{% for case in cases %} {% for casedetail in casedetails %}
{% with case=casedetail.case %}
<li data-question_pk={{case.pk}}> <li data-question_pk={{case.pk}}>
{{case.casedetail.sort_order}} <div class="case-item" data-title="{{case.title}}" data-case={{case.pk}} data-casejson='{{case.get_viva_details_json}}' data-images='{{case.get_series_images_nested}}' data-viewerstate={{casedetail.default_viewerstate_string}}>Case {{forloop.counter}}: {{case.title}} &nbsp;
<div class="case-item" data-title="{{case.title}}" data-case={{case.pk}} data-casejson='{{case.get_viva_details_json}}' data-images='{{case.get_series_images_nested}}'>Case {{forloop.counter}}: {{case.title}} &nbsp;
{% comment %} <button class="show-case no-padding" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Show</button> {% endcomment %} {% comment %} <button class="show-case no-padding" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Show</button> {% endcomment %}
{% comment %} <button class="send-message no-padding" data-title="{{case.title}}" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Open</button> {% endcomment %} {% comment %} <button class="send-message no-padding" data-title="{{case.title}}" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Open</button> {% endcomment %}
{% comment %} <button class="open-case no-padding" data-target="{% url 'atlas:collection_viva_case' collection.pk forloop.counter0 %}" data-type="case">Load</button> {% endcomment %} {% comment %} <button class="open-case no-padding" data-target="{% url 'atlas:collection_viva_case' collection.pk forloop.counter0 %}" data-type="case">Load</button> {% endcomment %}
<button class="open-case no-padding" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}" data-type="case">Load OHIF</button> <button class="open-case no-padding" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}" data-type="case">Load OHIF</button>
<button class="open-case-local no-padding" data-target=case.pk data-type="case">Load</button> <button class="open-case-local no-padding" data-target=case.pk data-type="case">Load</button>
<br /> <br />
<div class="pre-whitespace multi-image-block"> <div class="pre-whitespace multi-image-block">
<details class="series-detail"><summary>Series:</summary> <details class="series-detail"><summary>Series:</summary>
{% for series in case.series.all %} {% for series in case.series.all %}
<span class="series-block"> <span class="series-block">
<span> <span>
<span class="series-block-series-number">Series {{ forloop.counter }}:</span><br> <span class="series-block-series-number">Series {{ forloop.counter }}:</span><br>
{{series.get_block}} {{series.get_block}}
<br /> <br />
{% comment %} <button class="show-series no-padding text-secondary border-secondary" data-case={{case.pk}} data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:series_dicom_json' series.pk %}"> {% comment %} <button class="show-series no-padding text-secondary border-secondary" data-case={{case.pk}} data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:series_dicom_json' series.pk %}">
show show
</button> {% endcomment %} </button> {% endcomment %}
{% comment %} <button class="open-series no-padding text-secondary border-secondary" data-type="series" data-series={{forloop.counter}} data-case={{case.pk}} data-target="{% url 'atlas:collection_viva_series' collection.pk series.pk %}"> {% endcomment %} {% comment %} <button class="open-series no-padding text-secondary border-secondary" data-type="series" data-series={{forloop.counter}} data-case={{case.pk}} data-target="{% url 'atlas:collection_viva_series' collection.pk series.pk %}"> {% endcomment %}
<button class="open-series no-padding text-secondary border-secondary" data-type="series" data-series={{forloop.counter}} data-case={{case.pk}} data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:series_dicom_json' series.pk %}"> <button class="open-series no-padding text-secondary border-secondary" data-type="series" data-series={{forloop.counter}} data-case={{case.pk}} data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:series_dicom_json' series.pk %}">
Load Load
</button> </button>
<button class="open-series-local no-padding text-secondary border-secondary" <button class="open-series-local no-padding text-secondary border-secondary"
data-type="series" data-type="series"
data-series="{{ forloop.counter }}" data-series="{{ forloop.counter }}"
data-case="{{ case.pk }}" data-case="{{ case.pk }}"
data-target="{{ series.pk }}"> data-target="{{ series.pk }}">
Load Load
</button> </button>
<br> <br>
</span>
</span> </span>
</span> {% endfor %}
{% endfor %} </details>
</details> </div>
</div> </div>
</div> </li>
</li>
{% endwith %}
{% endfor %} {% endfor %}
</ol> </ol>
</div> </div>
@@ -92,37 +93,37 @@
var win2 = false; var win2 = false;
$(document).ready(function() { $(document).ready(function() {
let loadLocalMode = true; let loadLocalMode = true;
// Update all "Load" buttons to reflect the current mode // Update all "Load" buttons to reflect the current mode
function updateLoadButtons() { function updateLoadButtons() {
if (loadLocalMode) { if (loadLocalMode) {
$('.open-case').hide(); $('.open-case').hide();
$('.open-series').hide(); $('.open-series').hide();
$('.open-case-local').show(); $('.open-case-local').show();
$('.open-series-local').show(); $('.open-series-local').show();
$('#toggle-load-mode').text('Switch to Load OHIF'); $('#toggle-load-mode').text('Switch to Load OHIF');
$("#open-viewer").hide() $("#open-viewer").hide()
$("#open-viewer-local").show() $("#open-viewer-local").show()
} else { } else {
$('.open-case').show(); $('.open-case').show();
$('.open-series').show(); $('.open-series').show();
$('.open-case-local').hide(); $('.open-case-local').hide();
$('.open-series-local').hide(); $('.open-series-local').hide();
$("#open-viewer").show() $("#open-viewer").show()
$("#open-viewer-local").hide() $("#open-viewer-local").hide()
$('#toggle-load-mode').text('Switch to Load Local'); $('#toggle-load-mode').text('Switch to Load Local');
} }
} }
// Initial state: show only normal Load buttons // Initial state: show only normal Load buttons
updateLoadButtons(); updateLoadButtons();
// Toggle button click handler // Toggle button click handler
$('#toggle-load-mode').click(function() { $('#toggle-load-mode').click(function() {
loadLocalMode = !loadLocalMode; loadLocalMode = !loadLocalMode;
updateLoadButtons(); updateLoadButtons();
}); });
const bc = new BroadcastChannel("viva_load"); const bc = new BroadcastChannel("viva_load");
bc.onmessage = (event) => { bc.onmessage = (event) => {
@@ -152,6 +153,7 @@
console.log('clicked local', c) console.log('clicked local', c)
console.log('open local', c.dataset.case) console.log('open local', c.dataset.case)
case_details = JSON.parse(c.dataset.casejson); case_details = JSON.parse(c.dataset.casejson);
let viewerstate = JSON.parse(c.dataset.viewerstate) || {};
$('#loading-case').show() $('#loading-case').show()
$("#open-viewer-local").addClass("flash-button"); $("#open-viewer-local").addClass("flash-button");
$('#current-case-title').html("<span class='title'>Case:</span> "+c.dataset.title); $('#current-case-title').html("<span class='title'>Case:</span> "+c.dataset.title);
@@ -159,7 +161,10 @@
$("#current-case-discussion").html("<span class='title'>Discussion:</span> "+case_details['discussion']); $("#current-case-discussion").html("<span class='title'>Discussion:</span> "+case_details['discussion']);
$("#current-case-report").html("<span class='title'>Report:</span> "+case_details['report']); $("#current-case-report").html("<span class='title'>Report:</span> "+case_details['report']);
bc.postMessage({"type": "open", "case" : c.dataset.case, "images": c.dataset.images}); bc.postMessage({"type": "open",
"case" : c.dataset.case, "images": c.dataset.images,
"viewerstate": viewerstate
});
}); });
$('.open-series-local').click(function() { $('.open-series-local').click(function() {
@@ -181,7 +186,7 @@
"type": "open", "type": "open",
"case": c.dataset.case, "case": c.dataset.case,
"series": seriesPk, "series": seriesPk,
"images": JSON.stringify(images) "images": JSON.stringify(images),
}); });
}); });
$('.open-case, .open-series').click(function() { $('.open-case, .open-series').click(function() {
atlas/templates/atlas/viewer_local.html
+43 -32
View File
@@ -2,8 +2,8 @@
{% load static %} {% load static %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Viewer</title> <title>Viewer</title>
<style type="text/css"> <style type="text/css">
body, html body, html
{ {
@@ -16,39 +16,50 @@
} }
</style> </style>
<script src="{% static 'dv3d/index.js' %}" type="module" defer="defer" type="module"></script> <script src="{% static 'dv3d/index.js' %}" type="module" defer="defer" type="module"></script>
</head> </head>
<body> <body>
<div id="awating-load"> <div id="awating-load">
<p>Awating load request</p> <p>Awating load request</p>
This page will display series when loaded from other pages. This page will display series when loaded from other pages.
</div> </div>
<div id="root" class="dicom-viewer-root" <div id="root" class="dicom-viewer-root"
style="box-sizing: border-box; background: #222; position: absolute; top: 0; left: 0; right: 0; bottom: 0; width: 100vw; height: 100vh;" style="box-sizing: border-box; background: #222; position: absolute; top: 0; left: 0; right: 0; bottom: 0; width: 100vw; height: 100vh;"
data-auto-cache-stack="true" data-auto-cache-stack="true"
></div> ></div>
<script type="text/javascript"> <script type="text/javascript">
var win2 = false; var win2 = false;
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
document.title = "Case: {{current_case.title}}"; document.title = "Case: {{current_case.title}}";
console.log('ready'); console.log('ready');
const bc = new BroadcastChannel("viva_load"); const bc = new BroadcastChannel("viva_load");
bc.onmessage = (event) => { bc.onmessage = (event) => {
console.log("message received"); console.log("message received");
console.log(event); console.log(event);
if (event.data.type == "open") { if (event.data.type == "open") {
document.getElementById("awating-load").style.display = "none"; document.getElementById("awating-load").style.display = "none";
console.log("open, images: ", event.data.images); console.log("open, images: ", event.data.images);
document.getElementById("root").dataset.images = event.data.images; document.getElementById("root").dataset.images = event.data.images;
window.mountDicomViewers(); console.log("viewerstate: ", event.data.viewerstate);
bc.postMessage({"type": "open-complete-local"}); console.log(event.data.viewerstate == {});
} if (
}; event.data.viewerstate &&
}); Object.keys(event.data.viewerstate).length > 0
</script> ) {
document.getElementById("root").dataset.viewerstate = event.data.viewerstate;
} else {
delete document.getElementById("root").dataset.viewerstate;
}
</body> window.mountDicomViewers();
bc.postMessage({"type": "open-complete-local"});
}
};
});
</script>
</body>
</html> </html>
atlas/views.py
+17 -11
View File
@@ -1611,22 +1611,28 @@ class CollectionView(LoginRequiredMixin, SingleTableMixin, FilterView):
def collection_viva(request, pk): def collection_viva(request, pk):
collection = get_object_or_404(CaseCollection, pk=pk) collection = get_object_or_404(CaseCollection, pk=pk)
cases = ( #cases = (
collection.cases.all() # collection.cases.all()
.order_by("casedetail__sort_order") # .order_by("casedetail__sort_order")
.prefetch_related( # .prefetch_related(
"series", # "series",
"series__images", # "series__images",
"series__contrast", # "series__contrast",
"series__plane", # "series__plane",
"series__examination", # "series__examination",
) # )
#)
casedetails = CaseDetail.objects.filter(collection=collection).order_by(
"sort_order"
) )
logger.debug(casedetails)
return render( return render(
request, request,
"atlas/collection_viva.html", "atlas/collection_viva.html",
{"collection": collection, "cases": cases, "can_edit": True}, {"collection": collection, "casedetails": casedetails, "can_edit": True},
) )
rad/static/dv3d/index.js
+8 -8
View File
File diff suppressed because one or more lines are too long