X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=7d7723f2548b9e25bde95632c5f5f914987eb1da;hb=ab3dc69a71af640fa49cbd917272d9ff7d1651b6;hp=7f330020ca481da8eeca750c770d89a5ea7df775;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 7f330020..7d7723f2 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestChangeHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/08 15:03:58 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/01/25 15:29:33 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,20 +31,20 @@ int TestChangeHeader(int argc, char* argv[])
       return 1;
    }
 
-   std::string premier = argv[1];
-   gdcmFile  *f1 = new gdcmFile(premier);
+   std::string firstArgument = argv[1];
+   gdcmFile  *f1 = new gdcmFile(firstArgument);
 
-   std::string deuxieme = argv[2];
-   gdcmFile  *f2 = new gdcmFile(deuxieme);
+   std::string secondArgument = argv[2];
+   gdcmFile  *f2 = new gdcmFile(secondArgument);
 
    //f1->PrintPubElVal();
 
-   // We suppose the DICOM Entries of the second file *do* exist !
+   // We suppose the DICOM Entries of the second file *does* exist !
 
-   std::string nbFrames = f2->GetHeader()->GetEntry(0x0028, 0x0008);
+   std::string nbFrames = f2->GetHeader()->GetEntryValue(0x0028, 0x0008);
    if(nbFrames != "gdcm::Unfound")
    {
-      f1->GetHeader()->ReplaceOrCreate( nbFrames, 0x0028, 0x0008);
+      f1->GetHeader()->Insert( nbFrames, 0x0028, 0x0008);
    }
 
 
@@ -57,18 +57,18 @@ int TestChangeHeader(int argc, char* argv[])
 // It was not designed as a 'Test' program, but as a utility
 // provided to 'transform' an image 'Siemens MRI New version' into an image 'Siemens MRI old version'
          
-   f1->GetHeader()->ReplaceOrCreate(
-      f2->GetHeader()->GetEntry(0x0028, 0x0010), 0x0028, 0x0010);// nbLig
-   f1->GetHeader()->ReplaceOrCreate( 
-      f2->GetHeader()->GetEntry(0x0028, 0x0011), 0x0028, 0x0011);// nbCol
-   f1->GetHeader()->ReplaceOrCreate( 
-      f2->GetHeader()->GetEntry(0x0028, 0x0100), 0x0028, 0x0100);// BitsAllocated
-   f1->GetHeader()->ReplaceOrCreate( 
-      f2->GetHeader()->GetEntry(0x0028, 0x0101), 0x0028, 0x0101);// BitsStored
-   f1->GetHeader()->ReplaceOrCreate( 
-      f2->GetHeader()->GetEntry(0x0028, 0x0102), 0x0028, 0x0102);// HighBit
-   f1->GetHeader()->ReplaceOrCreate( 
-      f2->GetHeader()->GetEntry(0x0028, 0x0103), 0x0028, 0x0103);// Pixel Representation
+   f1->GetHeader()->Insert(
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0010), 0x0028, 0x0010);// nbLig
+   f1->GetHeader()->Insert( 
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0011), 0x0028, 0x0011);// nbCol
+   f1->GetHeader()->Insert( 
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0100), 0x0028, 0x0100);// BitsAllocated
+   f1->GetHeader()->Insert( 
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0101), 0x0028, 0x0101);// BitsStored
+   f1->GetHeader()->Insert( 
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0102), 0x0028, 0x0102);// HighBit
+   f1->GetHeader()->Insert( 
+      f2->GetHeader()->GetEntryValue(0x0028, 0x0103), 0x0028, 0x0103);// Pixel Representation
 // Probabely some more to update (?)
 
 // TODO : add a default value
@@ -85,8 +85,8 @@ int TestChangeHeader(int argc, char* argv[])
 
    f1->GetHeader()->Print();
 
-   std::string s0 =f2->GetHeader()->GetEntry(0x7fe0, 0x0000);
-   std::string s10=f2->GetHeader()->GetEntry(0x7fe0, 0x0010);
+   std::string s0 =f2->GetHeader()->GetEntryValue(0x7fe0, 0x0000);
+   std::string s10=f2->GetHeader()->GetEntryValue(0x7fe0, 0x0010);
    printf("lgr 7fe0, 0000 %s\n",s0.c_str());
    printf("lgr 7fe0, 0010 %s\n",s10.c_str());