X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FPrintHeader.py;h=1019c49ad37074488eb5f9e5265daa5768e66574;hb=ba91c71660a3989f80dc58803244f5fca47850e5;hp=fa98de2d86a4a8108a69f2b027ad399ca0b9e66e;hpb=f978dcd25d35bb7dcd2e21f5ca192cc9aea4e8ec;p=gdcm.git

diff --git a/gdcmPython/demo/PrintHeader.py b/gdcmPython/demo/PrintHeader.py
index fa98de2d..1019c49a 100644
--- a/gdcmPython/demo/PrintHeader.py
+++ b/gdcmPython/demo/PrintHeader.py
@@ -1,30 +1,42 @@
-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")
 
-if not os.path.isfile(FileName):
-   print "Cannot open file ", FileName
-   sys.exit()
+try:
+   printLevel = int(sys.argv[2])
+except IndexError:
+   printLevel = 1
+
+#if not os.path.isfile(FileName):
+#   print "Cannot open file ", FileName
+#   sys.exit()
 
 # On debugging purposes uncomment the next line
 #s = raw_input("Hit any key in this window to exit")
 
 ### Build the header element list
-toRead = gdcmHeader(FileName)
-if not toRead.IsReadable():
-   print "The ", FileName, " file is not "
-   print "   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 "##############################################################"
-ValDict = toRead.GetPubElVal()
-for key in ValDict.keys():
-	print "[%s] = [%s]" %(key, ValDict[key])
+
+header.InitTraversal()
+val=header.GetNextEntry()
+while(val):
+	val.Print()
+	print ""
+	val=header.GetNextEntry()
+val=None
+