improve dicom diff (still needs work)

atlas/views.py

@@ -1050,6 +1050,7 @@ def image_diff(request):
 
         image_ids = request.POST.getlist("image-id")
 
+        if len(image_ids) == 2:
             first: SeriesImage = get_object_or_404(SeriesImage, pk=image_ids[0])
             second: SeriesImage = get_object_or_404(SeriesImage, pk=image_ids[1])
 
@@ -1071,6 +1072,15 @@ def image_diff(request):
 
             return HttpResponse(f"<pre>{dict_diff}</pre><br/>{diff}")
         
+        else:
+            ds_set = []
+            for pk in image_ids:
+                series_image = get_object_or_404(SeriesImage, pk=pk)
+                ds_set.append(pydicom.read_file(series_image.image.file))
+
+            dict_diff = pprint.pformat(compare_dicom_datasets(*ds_set))
+            return HttpResponse(f"<pre>{dict_diff}</pre>")
+
 
     return HttpResponse("Fail")
 

helpers/images.py

@@ -1,4 +1,5 @@
 import base64
+from collections import defaultdict
 import hashlib
 import mimetypes
 
@@ -258,24 +259,30 @@ def compare_dicom_elements(element1: pydicom.DataElement, element2: pydicom.Data
 
     return differences
 
-def compare_dicom_datasets(dataset1: pydicom.Dataset, dataset2: pydicom.Dataset):
+def compare_dicom_datasets(*datasets: pydicom.Dataset):
-    differences = {}
+    differences = defaultdict(list)
 
     # Compare the dataset elements
-    for element1 in dataset1:
+    for i, dataset in enumerate(datasets):
+        for element1 in dataset:
+            for j in range(i+1, len(datasets)):
+                dataset2 = datasets[j]
                 element2 = dataset2.get(element1.tag)
                 if element2 is None:
-            differences[f"{element1.tag} {element1.name}"] = ('missing', element1.value)
+                    differences[f"{element1.tag} {element1.name}"].append(('missing', element1.value))
                 else:
                     element_differences = compare_dicom_elements(element1, element2)
                     if element_differences:
-                differences[f"{element1.tag} {element1.name}"] = element_differences
+                        differences[f"{element1.tag} {element1.name}"].append(element_differences)
 
-    # Check for any extra elements in dataset2
+    # Check for any extra elements in the datasets
-    for element2 in dataset2:
+    for i, dataset in enumerate(datasets):
-        element1 = dataset1.get(element2.tag)
+        for element2 in dataset:
+            for j in range(i+1, len(datasets)):
+                dataset2 = datasets[j]
+                element1 = dataset2.get(element2.tag)
                 if element1 is None:
-            differences[f"{element1.tag} {element1.name}"] = ('extra', element2.value)
+                    differences[f"{element1.tag} {element1.name}"].append(('extra', element2.value))
 
     return differences