X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FPrintFile.py.in;h=7506aef0150dee2f552a7859aca1a5a165f3aef5;hb=6b1f17a56aac52981c365c32413fa4283a1e0340;hp=9098bd8f1ddf3003a9dc48ce9b15244563a7f416;hpb=8a267f0eb936f72046f50e0c731fa6f33ebc13ce;p=gdcm.git

diff --git a/gdcmPython/demo/PrintFile.py.in b/gdcmPython/demo/PrintFile.py.in
index 9098bd8f..7506aef0 100644
--- a/gdcmPython/demo/PrintFile.py.in
+++ b/gdcmPython/demo/PrintFile.py.in
@@ -12,6 +12,12 @@ 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]
@@ -26,7 +32,7 @@ except IndexError:
    printLevel = 1
 
 ### Build the file element list
-file = gdcm.File()
+file = gdcm.File.New()
 file.SetFileName(fileName)
 file.Load()
 if not file.IsReadable():
@@ -49,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