ENH: Remove convenient library herited from jasper autotools, and replace by a more...

[gdcm.git] / gdcmPython / demo / PrintDicomDir.py.in

diff --git a/gdcmPython/demo/PrintDicomDir.py.in b/gdcmPython/demo/PrintDicomDir.py.in
index 4b016d43037842c6537d315290154d69e22bfd7d..a6aa6d74d096447fb1715702186dbd29afbebdfe 100644 (file)
--- a/gdcmPython/demo/PrintDicomDir.py.in
+++ b/gdcmPython/demo/PrintDicomDir.py.in
@@ -1,3 +1,5 @@
+import sys
+import os.path
 from gdcmConfigDemo import *
 from gdcmPython.core import *
 
@@ -15,6 +17,8 @@ try:
    fileName = sys.argv[1]
 except IndexError:
    fileName = os.path.join(GDCM_DATA_ROOT, "DICOMDIR")
+   if( not os.path.isfile(fileName) ):
+      fileName=os.path.join(os.path.split(sys.argv[0])[0],"DICOMDIR")
 
 try:
    printLevel = int(sys.argv[2])
@@ -35,3 +39,22 @@ print "##############################################################"
 dicomdir.SetPrintLevel(-1)
 dicomdir.Print()
 
+print ""
+patient=dicomdir.GetFirstPatient()
+while(patient):
+   print "Patient"
+   study=patient.GetFirstStudy()
+   while(study):
+      print "   Study"
+      serie=study.GetFirstSerie()
+      while(serie):
+         print "      Serie"
+         image=serie.GetFirstImage()
+         while(image):
+            print "         Image"
+            print "         ---",image.GetValEntry(0x0004,0x1500).GetValue()
+            image=serie.GetNextImage()
+         serie=study.GetNextSerie()
+      study=patient.GetNextStudy()
+   patient=dicomdir.GetNextPatient()
+