X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FPrintDicomDir.py.in;h=c988a4e6b0f89c072d849de71b50cb41d1d3e48d;hb=2ce6422178e709073fc24aa2e3d4f5069711cd18;hp=a6aa6d74d096447fb1715702186dbd29afbebdfe;hpb=404c8b83212e675c77458f9cf2c3cfb851c7eee2;p=gdcm.git

diff --git a/gdcmPython/demo/PrintDicomDir.py.in b/gdcmPython/demo/PrintDicomDir.py.in
index a6aa6d74..c988a4e6 100644
--- a/gdcmPython/demo/PrintDicomDir.py.in
+++ b/gdcmPython/demo/PrintDicomDir.py.in
@@ -12,6 +12,14 @@ def PrintUse():
    print ""
    print ""
 
+### Progress methods
+def startMethod():
+   print "Start"
+def progressMethod():
+   print "Progress",dicomdir.GetProgress()
+def endMethod():
+   print "End"
+
 ### Get filename from command line or default it
 try:
    fileName = sys.argv[1]
@@ -26,7 +34,14 @@ except IndexError:
    printLevel = 1
 
 ### Build the DicomDir element list
-dicomdir = gdcm.DicomDir(fileName)
+dicomdir = gdcm.DicomDir()
+
+dicomdir.SetStartMethod(startMethod)
+dicomdir.SetProgressMethod(progressMethod)
+dicomdir.SetEndMethod(endMethod)
+
+dicomdir.SetFileName(fileName)
+dicomdir.Load()
 if not dicomdir.IsReadable():
    PrintUse()
    raise RuntimeError,"The '%s' DicomDir is not readable with gdcm." % fileName
@@ -52,9 +67,23 @@ while(patient):
          image=serie.GetFirstImage()
          while(image):
             print "         Image"
-            print "         ---",image.GetValEntry(0x0004,0x1500).GetValue()
+            print "         ---",image.GetDataEntry(0x0004,0x1500).GetString()
             image=serie.GetNextImage()
          serie=study.GetNextSerie()
       study=patient.GetNextStudy()
    patient=dicomdir.GetNextPatient()
 
+dicomdir.SetDirectoryName(os.path.dirname(fileName))
+dicomdir.Load()
+if not dicomdir.IsReadable():
+   PrintUse()
+   raise RuntimeError,"The '%s' DicomDir is not readable with gdcm." % fileName
+
+print "DICOMDIR -->",fileName
+print "##############################################################"
+print "## Display all the elements and their respective values"
+print "## found in the ", fileName, " file."
+print "##############################################################"
+dicomdir.SetPrintLevel(-1)
+dicomdir.Print()
+