X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestChangeHeader.cxx;h=c6c19cd3d13c3a7cb1bde55058df93eb58ff52aa;hb=247c979db58d7bfd1d65029de05f4142a534c4c8;hp=6baada033ddfd82cf96e61edd57c2c0f4df5f892;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git

diff --git a/Example/TestChangeHeader.cxx b/Example/TestChangeHeader.cxx
index 6baada03..c6c19cd3 100644
--- a/Example/TestChangeHeader.cxx
+++ b/Example/TestChangeHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestChangeHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:16:58 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/10/25 14:52:27 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,45 +15,56 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#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
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
-    if (argc < 3)
-    {
-       std::cerr << "usage :" << std::endl <<
-         argv[0] << " nomFichierPourEntete nomFichierPourDonnées" << 
-         std::endl;
-       return 1;
-    }
+   if (argc < 3)
+   {
+      std::cerr << "usage :" << std::endl <<
+      argv[0] << " fileNameForHeader fileNameForData" << 
+      std::endl;
+      return 1;
+   }
 
-    gdcm::Header *h1 = new gdcm::Header( argv[1] );
-    gdcm::FileHelper  *f1 = new gdcm::FileHelper( h1 );
-    gdcm::FileHelper  *f2 = new gdcm::FileHelper( argv[2] );
+   gdcm::File *h1 = gdcm::File::New( );
+   h1->SetFileName ( argv[1] );
+   h1->Load( );
+   gdcm::FileHelper  *f1 = gdcm::FileHelper::New( h1 );
+   
+   gdcm::File *h2 = gdcm::File::New( );
+   h2->SetFileName ( argv[2] );
+   h2->Load( );
+   gdcm::FileHelper  *f2 = gdcm::FileHelper::New( h2 );   
+   
 
-    // 0018 1310 US ACQ Acquisition Matrix
-    gdcm::DictEntry *dictEntry =
-       f2->GetHeader()->GetPubDict()->GetDictEntry( 0x0018, 1310 );
-    std::cerr << std::hex << dictEntry->GetGroup() << "," << dictEntry->GetElement() << std::endl;
+   // 0018 1310 US ACQ Acquisition Matrix
+   gdcm::DictEntry *dictEntry =
+                        f2->GetFile()->GetPubDict()->GetEntry( 0x0018, 1310 );
+   std::cerr << std::hex << dictEntry->GetGroup() << "," 
+            << dictEntry->GetElement() << std::endl;
 
-    std::string matrix = f2->GetHeader()->GetEntry(0x0018, 0x1310);
-    if(matrix != "gdcm::Unfound")
-    {
-       std::cerr << "Aquisition Matrix:" << matrix << std::endl;
-       f1->GetHeader()->ReplaceOrCreate( matrix, 0x0018, 0x1310);
-    }
+   std::string matrix = f2->GetFile()->GetEntryString(0x0018, 0x1310);
+   if(matrix != "gdcm::Unfound")
+   {
+      std::cerr << "Aquisition Matrix:" << matrix << std::endl;
+      f1->GetFile()->InsertEntryString( matrix, 0x0018, 0x1310);
+   }
 
-    f1->GetImageData();
-    
-    h1->Print();
-    
-    f1->WriteDcmExplVR("output-matrix.dcm");
+   f1->GetImageData();
+   
+   h1->Print();
+   
+   f1->WriteDcmExplVR("output-matrix.dcm");
+   
+   f1->Delete();
+   f2->Delete();
+   h1->Delete();
+   h2->Delete();
 
-    return 0;
+   return 0;
 }
-
-