This commit is contained in:
Ross
2021-03-02 20:32:08 +00:00
parent 38dcbf119c
commit c0eeb17482
4 changed files with 14 additions and 5 deletions
+2 -5
View File
@@ -189,6 +189,7 @@ class Long(models.Model):
#"feedback_image": [],
#"annotations": [str(q.image_annotations)],
"type": "long",
"cached": False,
}
return exam_question
@@ -377,14 +378,10 @@ class LongSeries(models.Model):
else:
skipcount = skipcount + 1
print("skipped, no SliceLocation: {}".format(skipcount))
print("skipped, no {}: {}".format(field, skipcount))
# ensure they are in the correct order
slices = sorted(slices, key=lambda s: s[field].value)
#if field == "SliceLocation":
# slices = sorted(slices, key=lambda s: s.SliceLocation)
#elif field == "InstanceNumber":
# slices = sorted(slices, key=lambda s: s.InstanceNumber)
#print(slices)
@@ -17,6 +17,7 @@ This series is not associated with any cases.
<div>
<a href="{% url 'longs:long_series_order_dicom' pk=series.pk %}" title="orders dicom by slice location">Order dicoms by slice location</a>
<a href="{% url 'longs:long_series_order_dicom_instance' pk=series.pk %}" title="orders dicom by instance number">Order dicoms by instance number</a>
<a href="{% url 'longs:long_series_order_dicom_SeriesInstanceUID' pk=series.pk %}" title="orders dicom by instance number">Order dicoms by SeriesInstanceUID</a>
<a href="{% url 'longs:long_series_order_upload_filename' pk=series.pk %}" title="orders dicom by uploaded filename">Order by uploaded filename</a>
</div>
{% for image in series.images.all %}
+1
View File
@@ -13,6 +13,7 @@ urlpatterns = [
path("series/<int:pk>", views.long_series_detail, name="long_series_detail"),
path("series/<int:pk>/order_dicom", views.long_series_order_dicom, name="long_series_order_dicom"),
path("series/<int:pk>/order_dicom_instance", views.long_series_order_dicom_instance, name="long_series_order_dicom_instance"),
path("series/<int:pk>/order_dicom_SeriesInstanceUID", views.long_series_order_dicom_SeriesInstanceUID, name="long_series_order_dicom_SeriesInstanceUID"),
path("series/<int:pk>/order_upload_filename", views.long_series_order_upload_filename, name="long_series_order_upload_filename"),
path("series/<int:pk>/delete", views.LongSeriesDelete.as_view(), name="long_series_delete"),
# path("unchecked/", views.unchecked_list, name="unchecked_list"),
+10
View File
@@ -955,6 +955,16 @@ def long_series_order_dicom_instance(request, pk):
return redirect("longs:long_series_detail", pk=pk)
@login_required
def long_series_order_dicom_SeriesInstanceUID(request, pk):
series = get_object_or_404(LongSeries, pk=pk)
try:
series.order_by_dicom("SeriesInstanceUID")
except:
return HttpResponse('<h1>Series does not appear to contain dicoms (or field SeriesInstanceUID)</h1>')
return redirect("longs:long_series_detail", pk=pk)
@login_required
def long_series_order_upload_filename(request, pk):
series = get_object_or_404(LongSeries, pk=pk)