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

fix marking

Browse Source
This commit is contained in:
Ross
2020-11-23 15:46:08 +00:00
parent bb2fa5d457
commit f345ca4447
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anatomy/static/js/anatomy.js
+17 -10
View File
@@ -36,19 +36,15 @@ $(document).ready(function () {
if($("#dicom-element").length) {
$('#dicom-element').bind('contextmenu', function(e) {
return false;
});
cornerstoneBase64ImageLoader.external.cornerstone = cornerstone;
cornerstoneWebImageLoader.external.cornerstone = cornerstone;
cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
cornerstoneTools.init();
const element = document.getElementById('dicom-element');
const imageId = element.dataset.url;
cornerstone.enable(element);
cornerstone.loadAndCacheImage(imageId).then(function(image) {
cornerstone.displayImage(element, image);
const PanTool = cornerstoneTools.PanTool;
const ZoomTool = cornerstoneTools.ZoomTool;
const ZoomMouseWheelTool = cornerstoneTools.ZoomMouseWheelTool;
@@ -58,6 +54,15 @@ cornerstone.loadAndCacheImage(imageId).then(function(image) {
const StackScrollTool = cornerstoneTools.StackScrollTool;
const MagnifyTool = cornerstoneTools.MagnifyTool;
const element = document.getElementById('dicom-element');
const imageId = element.dataset.url;
cornerstone.enable(element);
cornerstone.loadAndCacheImage(imageId).then(function(image) {
cornerstone.displayImage(element, image);
cornerstoneTools.addTool(PanTool);
cornerstoneTools.addTool(ZoomTool);
cornerstoneTools.addTool(ZoomMouseWheelTool);
@@ -67,11 +72,13 @@ cornerstone.loadAndCacheImage(imageId).then(function(image) {
cornerstoneTools.addTool(StackScrollTool);
cornerstoneTools.addTool(MagnifyTool);
// Enable our tools
// Avoid incorrect aspect ratio
cornerstone.resize(element);
cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
cornerstoneTools.setToolActive("WwwcTool", { mouseButtonMask: 2 });
cornerstoneTools.setToolActive("Wwwc", { mouseButtonMask: 2 });
cornerstoneTools.setToolActive("ZoomMouseWheel", { mouseButtonMask: 3 });
cornerstoneTools.setToolActive("Zoom", { mouseButtonMask: 4 });
});
}
anatomy/templates/anatomy/mark.html
+1 -1
View File
@@ -5,6 +5,7 @@
<p>{{ question.question_type }}</p>
<div id="dicom-element" data-url="{{ question.image.url}}" />
</div>
<div class="marking">
<form method="POST" class="post-form">{% csrf_token %}
<div class="marking-list">Marked:
@@ -41,5 +42,4 @@
</span>
</form>
</div>
</div>
{% endblock %}
anatomy/views.py
+3 -3
View File
@@ -358,7 +358,7 @@ def mark(request, pk, sk):
if ans == "":
continue
a = Answer.objects.filter(answer__iexact=ans).first()
a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
if a is None:
a = Answer()
@@ -375,7 +375,7 @@ def mark(request, pk, sk):
if ans == "":
continue
a = Answer.objects.filter(answer__iexact=ans).first()
a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
if a is None:
a = Answer()
@@ -390,7 +390,7 @@ def mark(request, pk, sk):
if ans == "":
continue
a = Answer.objects.filter(answer__iexact=ans).first()
a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
if a is None:
a = Answer()