X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2Fdemo%2FtestAll.py;h=f67c2df745bd3151c34cc9605cbdaf0c3447595f;hb=d7a4d5d474ae599b723e52ebda8bd3fc6cee752a;hp=682742626c8c47d6d6247383c177827cfcd59d29;hpb=9676e37a52824da2f69d22c721178a4b5dc12191;p=gdcm.git

diff --git a/gdcmPython/demo/testAll.py b/gdcmPython/demo/testAll.py
index 68274262..f67c2df7 100644
--- a/gdcmPython/demo/testAll.py
+++ b/gdcmPython/demo/testAll.py
@@ -1,7 +1,8 @@
-from load import *
+import glob, os
+import sys
+from gdcmPython import *
 
-# Where all the test images are
-TestFileDir =  os.path.join("..", "..", "Data")
+# Test each file of the Data directory
 
 AllFiles = [
 	"CR-MONO1-10-chest.dcm",
@@ -27,12 +28,11 @@ AllFiles = [
 	]
 
 if __name__ == '__main__':
-	for file in AllFiles:
-		fileName = os.path.join(TestFileDir, file)
-		print "############## file :", fileName
-		toRead = gdcm.gdcmHeader(fileName)
-		toRead.LoadElements()
-		ValDict = toRead.GetPubElVal()
-		for key in ValDict.keys():
-			print "   [%s] = [%s]" %(key, ValDict[key])
-
+   # AllFiles = glob.glob(os.path.join(GDCM_TEST_DATA_PATH,"*.dcm"))
+   for file in AllFiles:
+      fileName = os.path.join(GDCM_TEST_DATA_PATH, file)
+      print "############## file :", fileName
+      toRead = gdcmHeader(fileName)
+      ValDict = toRead.GetPubEntry()
+      for key in ValDict.keys():
+          print "   [%s] = [%s]" %(key, ValDict[key])