X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=bfdc2ba282b89732c8a7b32dd92d363c78709870;hb=c556c62e38ad8f5b0423a91d919c13ac85a23f32;hp=3f87352475779be320751a78d4bf5383797666c4;hpb=5ce83ba7ad93f458923e5f3b7aa406651db90637;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 3f873524..bfdc2ba2 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestChangeHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 04:28:20 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2005/07/08 13:39:57 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,15 +15,17 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
+#include "gdcmFileHelper.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[])
+// NO SYNTAX UPDATED
+// Doesn't compile !
+
+int TestChangeHeader(int argc, char *argv[])
 {
    if (argc < 3)
    {
@@ -32,20 +34,22 @@ int TestChangeHeader(int argc, char* argv[])
       return 1;
    }
 
-   std::string premier = argv[1];
-   gdcmFile  *f1 = new gdcmFile(premier);
-
-   std::string deuxieme = argv[2];
-   gdcmFile  *f2 = new gdcmFile(deuxieme);
+   std::string firstArgument = argv[1];
+   
+   gdcm::File  *f1 = new gdcm::File();
+   f1->SetFileName(firstArgument);
+   f1->Load( );
+   std::string secondArgument = argv[2];
+   gdcm::File  *f2 = new gdcm::File(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);
    }
 
 
@@ -58,18 +62,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
@@ -78,17 +82,16 @@ int TestChangeHeader(int argc, char* argv[])
 
    int dataSize = f2->GetImageDataSize();
    printf ("dataSize %d\n",dataSize);
-   uint8_t* 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());