X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FPrintDict.py.in;h=aca8f437b17e5809e259b35a854bcb2d1d51c11b;hb=a0401014c0c575820453fab2197d97607a89150f;hp=8adbdd9d1ca1689b555706142f33742215a7492a;hpb=5a0d183707a94e875a595036f64d0bd506faf618;p=gdcm.git

diff --git a/gdcmPython/demo/PrintDict.py.in b/gdcmPython/demo/PrintDict.py.in
index 8adbdd9d..aca8f437 100644
--- a/gdcmPython/demo/PrintDict.py.in
+++ b/gdcmPython/demo/PrintDict.py.in
@@ -1,20 +1,11 @@
-import sys
-import os
-
-sys.path.append('${GDCM_BINARY_DIR}')
-if os.name == 'posix':
-   sys.path.append('${GDCM_BINARY_DIR}/bin')
-else:
-   sys.path.append('${GDCM_BINARY_DIR}/bin/Release')
-   sys.path.append('${GDCM_BINARY_DIR}/bin/Debug')
-
+from gdcmConfigDemo import *
 from gdcmPython.core import *
 
 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 +13,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,19 +21,20 @@ 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()
 
 print "#####################################################################"
 # Print the public Dict content
 print "dict content :"
-pubDict.InitTraversal()
-entry=pubDict.GetNextEntry()
+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()