From: regrain <regrain>
Date: Wed, 4 Feb 2004 12:50:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Version0.4~25
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7b8dcad5fbb9b248952ad6819ef984e7880ef81e;p=gdcm.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 42154f95..973aeda3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	     
 2004-02-04 Benoit Regrain
      * FIX : WriteEntries : coding style & logic in parameters
+     * FIX : Set the elements to create the DicomDir in a dictionary file
 
 2004-02-03 Benoit Regrain
      * gdcmDirList : to parse a hard drive directory in recursive (or not)
diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 4da27044..a9fceebe 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -184,6 +184,7 @@ int main(int argc, char* argv[])
       itPatient ++;    
    }*/
 
+   std::cout<<std::flush;
    delete e1;
 
    return(0);
diff --git a/gdcmPython/__init__.py b/gdcmPython/__init__.py
index 3cbeb9cf..86929df8 100644
--- a/gdcmPython/__init__.py
+++ b/gdcmPython/__init__.py
@@ -72,6 +72,7 @@ except ImportError,e:
 ### Expose only the necessary stuff
 gdcmGlobal       = gdcm.gdcmGlobal
 gdcmDictSet      = gdcm.gdcmDictSet
+gdcmDicomDir     = gdcm.gdcmDicomDir
 gdcmHeader       = gdcm.gdcmHeader
 gdcmHeaderHelper = gdcm.gdcmHeaderHelper
 gdcmFile         = gdcm.gdcmFile
diff --git a/gdcmPython/demo/PrintHeader.py b/gdcmPython/demo/PrintHeader.py
index 7648b483..4dafd140 100644
--- a/gdcmPython/demo/PrintHeader.py
+++ b/gdcmPython/demo/PrintHeader.py
@@ -7,6 +7,11 @@ try:
 except IndexError:
    FileName = os.path.join(GDCM_DATA_PATH, "test.acr")
 
+try:
+   printLevel = int(sys.argv[2])
+except IndexError:
+   printLevel = 1
+
 #if not os.path.isfile(FileName):
 #   print "Cannot open file ", FileName
 #   sys.exit()
@@ -24,6 +29,10 @@ print "##############################################################"
 print "### Display all the elements and their respective values"
 print "## found in the ", FileName, " file."
 print "##############################################################"
-ValDict = toRead.GetEntry()
-for key in ValDict.keys():
-	print "[%s] = [%s]" %(key, ValDict[key])
+toRead.SetPrintLevel(printLevel)
+toRead.Print()
+
+# ValDict = toRead.GetEntry()
+# for key in ValDict.keys():
+# 	print "[%s] = [%s]" %(key, ValDict[key])
+