* src/gdcmDicomDirElement.h, gdcmDict.h : rename AddNewXxx methods to AddXxx.

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

diff --git a/gdcmPython/demo/PrintDict.py.in b/gdcmPython/demo/PrintDict.py.in
index 03ac74973d9fc41496d7da9fcd5dc8cd087e04cd..82537d05d6cc5bcb634ab0ed3057ee10077fb3d9 100644 (file)
--- a/gdcmPython/demo/PrintDict.py.in
+++ b/gdcmPython/demo/PrintDict.py.in
@@ -14,7 +14,7 @@ print "#####################################################################"
 # Print the DictSet
 dicts=gdcm.Global.GetDicts()
 if(not isinstance(dicts,gdcm.DictSet)):
-       raise RuntimeError,"The DictSet hasn't the good type (%s)" % type(dicts)
+   raise RuntimeError,"The DictSet hasn't the good type (%s)" % type(dicts)
 print "DictSet content :"
 dicts.Print()
 
@@ -22,7 +22,7 @@ print "#####################################################################"
 # Print the Dict (public)
 pubDict=dicts.GetDefaultPubDict()
 if(not isinstance(pubDict,gdcm.Dict)):
-       raise RuntimeError,"The public Dict hasn't the good type (%s)" % type(dict)
+   raise RuntimeError,"The public Dict hasn't the good type (%s)" % type(dict)
 print "Public Dict content :"
 pubDict.Print()
 
@@ -30,10 +30,10 @@ print "#####################################################################"
 # Print the DictEntry (0010|0020)
 ENTRY_GR = 0x10
 ENTRY_EL = 0x20
-entry=pubDict.GetDictEntry(ENTRY_GR,ENTRY_EL)
+entry=pubDict.GetEntry(ENTRY_GR,ENTRY_EL)
 if(not isinstance(entry,gdcm.DictEntry)):
-       raise RuntimeError,"The entry (%04x|%04x) hasn't the good type (%s)" % \
-             (ENTRY_GR,ENTRY_EL,type(entry))
+   raise RuntimeError,"The entry (%04x|%04x) hasn't the good type (%s)" % \
+         (ENTRY_GR,ENTRY_EL,type(entry))
 print "Entry (%04x|%04x) content :" % (ENTRY_GR,ENTRY_EL)
 entry.Print()
 
@@ -42,6 +42,8 @@ print "#####################################################################"
 print "dict content :"
 entry=pubDict.GetFirstEntry()
 while(entry):
-       entry.Print()
-       entry=pubDict.GetNextEntry()
+   print "%4x|%4x [%s] - M%s : %s (%s)" %\
+         (entry.GetGroup(),entry.GetElement(),entry.GetVR(),entry.GetVM(),
+          entry.GetName(),entry.GetKey())
+   entry=pubDict.GetNextEntry()