* gdcmPython/demo/*.py : bug fix due to method names

     -- BeNours

diff --git a/ChangeLog b/ChangeLog
index de94800ad2dc418d9a2abc5382011704f80cddcb..db6de6c4edfd0bf295711d3347d8615a47090180 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
      * src/gdcmHeaderEntry.[h|cxx] : gdcmElValue -> gdcmHeaderEntry
      * src/gdcmHeaderEntrySet.[h|cxx] : gdcmElValSet -> gdcmHeaderEntrySet
      * src/*.[h|cxx] : make changes due to class name changes
+     * gdcmPython/demo/*.py : bug fix due to method names
 
 2004-01-13 Benoit Regrain
      * src/*.[h|cxx] : coding style

diff --git a/gdcmPython/demo/PrintHeader.py b/gdcmPython/demo/PrintHeader.py
index 6edd80fe7f4d7a43ea55874be12ae09f3c6afcfb..c5843d6f24c53a85deb28cd001392f957541162a 100644 (file)
--- a/gdcmPython/demo/PrintHeader.py
+++ b/gdcmPython/demo/PrintHeader.py
@@ -24,6 +24,6 @@ print "##############################################################"
 print "### Display all the elements and their respective values"
 print "## found in the ", FileName, " file."
 print "##############################################################"
-ValDict = toRead.GetPubElVal()
+ValDict = toRead.GetPubEntry()
 for key in ValDict.keys():
        print "[%s] = [%s]" %(key, ValDict[key])

diff --git a/gdcmPython/demo/ReorganiseFiles.py b/gdcmPython/demo/ReorganiseFiles.py
index 1ba6178e04f28a796e7764bbb7561407468b4ebb..e1372adb3337878dbcf1aab08b6dc7f4a6493c06 100644 (file)
--- a/gdcmPython/demo/ReorganiseFiles.py
+++ b/gdcmPython/demo/ReorganiseFiles.py
@@ -30,7 +30,7 @@ SourceFiles=glob.glob(os.path.join(SourceDirectory, "*.dcm"))
 
 for file in SourceFiles:
    header = gdcmHeader(file)
-   info = header.GetPubElVal()
+   info = header.GetPubEntry()
    try:
       ImNum = info["Image Number"]
       if len(ImNum) == 0 or ImNum == "gdcm::Unfound":

diff --git a/gdcmPython/demo/explore.py b/gdcmPython/demo/explore.py
index af124bb64dcf9cf3465ebb2a6cd157e551a9282b..defb226b2a72ab3aac6706491ad0f3e2c4d36643 100644 (file)
--- a/gdcmPython/demo/explore.py
+++ b/gdcmPython/demo/explore.py
@@ -11,7 +11,7 @@ if not os.path.isfile(FileName):
    sys.exit()
 
 toRead = gdcmHeader(FileName)
-ValDict = toRead.GetPubElVal()
+ValDict = toRead.GetPubEntry()
 ExploreElements = ["Patient Name", "Patient ID",
                                                 "Study Date", "Study Time", "Study ID",
                                                 "Study Instance UID",
@@ -24,3 +24,4 @@ for elem in ExploreElements:
                print "[%s]" % ValDict[elem]
        except KeyError:
                print "NOT FOUND"
+               

diff --git a/gdcmPython/demo/testAll.py b/gdcmPython/demo/testAll.py
index 9bf4a502502a3520f3253641e890743c3c87d6aa..f67c2df745bd3151c34cc9605cbdaf0c3447595f 100644 (file)
--- a/gdcmPython/demo/testAll.py
+++ b/gdcmPython/demo/testAll.py
@@ -33,6 +33,6 @@ if __name__ == '__main__':
       fileName = os.path.join(GDCM_TEST_DATA_PATH, file)
       print "############## file :", fileName
       toRead = gdcmHeader(fileName)
-      ValDict = toRead.GetPubElVal()
+      ValDict = toRead.GetPubEntry()
       for key in ValDict.keys():
           print "   [%s] = [%s]" %(key, ValDict[key])

diff --git a/gdcmPython/demo/vtkGdcmDemo.py b/gdcmPython/demo/vtkGdcmDemo.py
index f1e1c26f3f4160bc0fdd42442ddf7bb247ad234d..a6d14e4d44388c96530b07b31af4c06b17f2205b 100644 (file)
--- a/gdcmPython/demo/vtkGdcmDemo.py
+++ b/gdcmPython/demo/vtkGdcmDemo.py
@@ -179,7 +179,7 @@ if not check.IsReadable():
    print "The ", FileName, " file is not "
    print "   readable with gdcm. Sorry."
    sys.exit()
-check = check.GetPubElVal()
+check = check.GetPubEntry()
 try:
    HighBit = check["High Bit"]
    if len(HighBit) == 0 or HighBit == "gdcm::Unfound":