First stage of name normalisation : gdcm::File replace by gdcm::FileHelper

[gdcm.git] / Example / TestChangeHeader.cxx

diff --git a/Example/TestChangeHeader.cxx b/Example/TestChangeHeader.cxx
index 708d82fc32b5a59c122b9c3caa9e2a3edefb8355..6baada033ddfd82cf96e61edd57c2c0f4df5f892 100644 (file)
--- a/Example/TestChangeHeader.cxx
+++ b/Example/TestChangeHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestChangeHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 04:26:18 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/01/20 16:16:58 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,7 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmHeader.h"
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
 // This examples read two images (could be the same). Try to modify
 // Acquisition Matrix and then write the image again
@@ -27,29 +27,24 @@ int main(int argc, char* argv[])
     {
        std::cerr << "usage :" << std::endl <<
          argv[0] << " nomFichierPourEntete nomFichierPourDonnées" << 
-std::endl;
+         std::endl;
        return 1;
     }
 
     gdcm::Header *h1 = new gdcm::Header( argv[1] );
-    gdcm::File  *f1 = new gdcm::File( h1 );
-    gdcm::File  *f2 = new gdcm::File( argv[2] );
+    gdcm::FileHelper  *f1 = new gdcm::FileHelper( h1 );
+    gdcm::FileHelper  *f2 = new gdcm::FileHelper( argv[2] );
 
     // 0018 1310 US ACQ Acquisition Matrix
     gdcm::DictEntry *dictEntry =
-       f2->GetHeader()->GetPubDict()->GetDictEntryByName( "Acquisition Matrix" );
+       f2->GetHeader()->GetPubDict()->GetDictEntry( 0x0018, 1310 );
     std::cerr << std::hex << dictEntry->GetGroup() << "," << dictEntry->GetElement() << std::endl;
 
-   // std::string matrix = f2->GetHeader()->GetEntryByNumber(0x0018, 0x1310);
-   // Or, strictly equivalent (a little bit longer at run-time !):
-    std::string matrix = f2->GetHeader()->GetEntryByName("Acquisition Matrix");  
+    std::string matrix = f2->GetHeader()->GetEntry(0x0018, 0x1310);
     if(matrix != "gdcm::Unfound")
     {
        std::cerr << "Aquisition Matrix:" << matrix << std::endl;
-      f1->GetHeader()->ReplaceOrCreateByNumber( matrix, 0x0018, 0x1310);
-      
-       //f1->GetHeader()->ReplaceOrCreateByNumber( matrix, dictEntry->GetGroup(),
-       //  dictEntry->GetElement());
+       f1->GetHeader()->ReplaceOrCreate( matrix, 0x0018, 0x1310);
     }
 
     f1->GetImageData();