* Remove useless methods added by JPR for Python users. All was already

[gdcm.git] / gdcmPython / demo / PrintHeader.py

diff --git a/gdcmPython/demo/PrintHeader.py b/gdcmPython/demo/PrintHeader.py
index 7648b483b3b1b06b460bad49a9ebd9a559c45fdd..1019c49ad37074488eb5f9e5265daa5768e66574 100644 (file)
--- a/gdcmPython/demo/PrintHeader.py
+++ b/gdcmPython/demo/PrintHeader.py
@@ -1,11 +1,17 @@
-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])
+except IndexError:
+   printLevel = 1
 
 #if not os.path.isfile(FileName):
 #   print "Cannot open file ", FileName
@@ -15,15 +21,22 @@ except IndexError:
 #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 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.GetEntry()
-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
+