X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2Fdemo%2FPrintHeader.py;fp=gdcmPython%2Fdemo%2FPrintHeader.py;h=0125576c117b55f355647ab361c529488b70aad6;hb=cc00646f966fd2f882ea26f5e0238a58057e557d;hp=3239266fa9e658ff7dc4907f1a529716273e8e20;hpb=cb3e5481586abf9387b6e5b867b93b4dcfb60611;p=gdcm.git

diff --git a/gdcmPython/demo/PrintHeader.py b/gdcmPython/demo/PrintHeader.py
index 3239266f..0125576c 100644
--- a/gdcmPython/demo/PrintHeader.py
+++ b/gdcmPython/demo/PrintHeader.py
@@ -1,12 +1,12 @@
-from gdcmPython import *
+from gdcmPython.core import *
 import sys
 import os
 
 ### Get filename from command line or default it
 try:
-   FileName = sys.argv[1]
+   fileName = sys.argv[1]
 except IndexError:
-   FileName = os.path.join(GDCM_DATA_PATH, "test.acr")
+   fileName = os.path.join(GDCM_DATA_PATH, "test.acr")
 
 try:
    printLevel = int(sys.argv[2])
@@ -21,20 +21,22 @@ except IndexError:
 #s = raw_input("Hit any key in this window to exit")
 
 ### Build the header element list
-print FileName, type(FileName)
-toRead = gdcm.Header(FileName)
-if not toRead.IsReadable():
-   print "The ", FileName, " file is not readable with gdcm. Sorry."
+print fileName, type(fileName)
+header = gdcm.Header(fileName)
+if not header.IsReadable():
+   print "The ", fileName, " file is not readable with gdcm. Sorry."
    sys.exit()
 
 print "##############################################################"
 print "### Display all the elements and their respective values"
-print "## found in the ", FileName, " file."
+print "## found in the ", fileName, " file."
 print "##############################################################"
-###toRead.SetPrintLevel(printLevel)
-###toRead.Print()
 
-ValDict = toRead.GetEntry()
-for key in ValDict.keys():
- 	print "[%s] = [%s]" %(key, ValDict[key])
+header.Initialize()
+val=header.GetNextEntry()
+while(val):
+	val.Print()
+	print ""
+	val=header.GetNextEntry()
+val=None