X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=9739ebaec142c04e642a3567f4598cf99dbc10bc;hb=6fb9651c7810f2d875315442c4c4d27e6e6d9cb5;hp=bfae6f1a2715215fa5de2029657343d3a16091ef;hpb=9cc4e61ceb54b8b292483206ff69d13b7ee6f179;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index bfae6f1a..9739ebae 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -1,12 +1,28 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestChangeHeader.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/02/02 12:02:33 $
+  Version:   $Revision: 1.34 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include "gdcmHeader.h"
 #include "gdcmFile.h"
-#include <string>
 
 // Writting of a DICOM file, using a correct gdcmHeader.
 // and pixels of an other image
 
 
-int TestChangeHeader(int argc, char* argv[])
+int TestChangeHeader(int argc, char *argv[])
 {
    if (argc < 3)
    {
@@ -15,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()->GetEntryByNumber(0x0028, 0x0008);
-   if(nbFrames != "gdcm::Unfound")
+   std::string nbFrames = f2->GetHeader()->GetEntryValue(0x0028, 0x0008);
+   if(nbFrames != GDCM_UNFOUND)
    {
-      f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
+      f1->GetHeader()->Insert( nbFrames, 0x0028, 0x0008);
    }
 
 
@@ -41,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()->ReplaceOrCreateByNumber(
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0010), 0x0028, 0x0010);// nbLig
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0011), 0x0028, 0x0011);// nbCol
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0100), 0x0028, 0x0100);// BitsAllocated
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0101), 0x0028, 0x0101);// BitsStored
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0102), 0x0028, 0x0102);// HighBit
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(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
@@ -61,17 +77,16 @@ int TestChangeHeader(int argc, char* argv[])
 
    int dataSize = f2->GetImageDataSize();
    printf ("dataSize %d\n",dataSize);
-   void* imageData= f2->GetImageData();
+   uint8_t *imageData= f2->GetImageData();
 
-// TODO : Why don't we merge theese 2 functions ?
+// TODO : Why don't we merge these 2 functions ?
 
    f1->SetImageData(imageData,dataSize);
-   f1->GetHeader()->SetImageDataSize(dataSize);
 
    f1->GetHeader()->Print();
 
-   std::string s0 =f2->GetHeader()->GetEntryByNumber(0x7fe0, 0x0000);
-   std::string s10=f2->GetHeader()->GetEntryByNumber(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());