BUG: Apparently python2.5 do not like extension to have a .dll extension, we need...

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

diff --git a/gdcmPython/demo/PrintFile.py.in b/gdcmPython/demo/PrintFile.py.in
index 007a3fa1bfc8422f39044e58c2c163d6649c9f78..7506aef0150dee2f552a7859aca1a5a165f3aef5 100644 (file)
--- a/gdcmPython/demo/PrintFile.py.in
+++ b/gdcmPython/demo/PrintFile.py.in
@@ -1,4 +1,5 @@
 import sys
+import os.path
 from gdcmConfigDemo import *
 from gdcmPython.core import *
 
@@ -11,11 +12,19 @@ def PrintUse():
    print ""
    print ""
 
+try:
+   print gdcm.DataEntry
+   print gdcm.DataEntryPtr
+except:
+   pass
+
 ### Get filename from command line or default it
 try:
    fileName = sys.argv[1]
 except IndexError:
    fileName = os.path.join(GDCM_DATA_ROOT, "test.acr")
+   if( not os.path.isfile(fileName) ):
+      fileName=os.path.join(os.path.split(sys.argv[0])[0],"test.acr")
 
 try:
    printLevel = int(sys.argv[2])
@@ -23,7 +32,9 @@ except IndexError:
    printLevel = 1
 
 ### Build the file element list
-file = gdcm.File(fileName)
+file = gdcm.File.New()
+file.SetFileName(fileName)
+file.Load()
 if not file.IsReadable():
    PrintUse()
    raise RuntimeError,"The '%s' file is not readable with gdcm." % fileName
@@ -44,12 +55,9 @@ val=None
 print "##############################################################"
 val=file.GetFirstEntry()
 while(val):
-   if(isinstance(val,gdcm.ValEntryPtr)):
-      print "Val %04d|%04d [%s] : %s" % (val.GetGroup(),val.GetElement(),
-                                         val.GetName(),val.GetValue())
-   else:
-      print "Bin %04d|%04d [%s] : %s" % (val.GetGroup(),val.GetElement(),
-                                         val.GetName(),val.GetValue())
+   if(isinstance(val,gdcm.DataEntry)):
+      print "Data %s [%s] [%s] : %s" % (val.GetKey().str(),val.GetVR().str(),
+                                        val.GetName(),val.GetString())
    val=file.GetNextEntry()
 val=None