X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FTestChangeHeader.cxx;h=7d7723f2548b9e25bde95632c5f5f914987eb1da;hb=5544a1627fc9bb02b2d4c20b4ffa3ba8fa81c0ae;hp=819d70b787e0c71705072c2d15a57e4e5d876da5;hpb=05a8ef5406eb1d78b0a43a714b41656a297a7f3c;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 819d70b7..7d7723f2 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -1,10 +1,25 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestChangeHeader.cxx,v $
+  Language:  C++
+  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
+  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>
 
-
-// ecriture d'un fichier DICOM à partir d'un dcmHeader correct.
-// et des pixels d'une autre image
+// Writting of a DICOM file, using a correct gdcmHeader.
+// and pixels of an other image
 
 
 int TestChangeHeader(int argc, char* argv[])
@@ -12,51 +27,66 @@ int TestChangeHeader(int argc, char* argv[])
    if (argc < 3)
    {
       std::cerr << "usage :" << std::endl << 
-      argv[0] << " nomFichierPourEntete nomFichierPourDonnées" << std::endl;
+      argv[0] << " FileForHeader FileForPixels" << std::endl;
       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();
 
-   // On suppose que les champs DICOM du 2ieme fichier existent *effectivement*
+   // We suppose the DICOM Entries of the second file *does* exist !
 
-   std::string nbFrames = f2->GetHeader()->GetEntryByNumber(0x0028, 0x0008);
+   std::string nbFrames = f2->GetHeader()->GetEntryValue(0x0028, 0x0008);
    if(nbFrames != "gdcm::Unfound")
    {
-      f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
+      f1->GetHeader()->Insert( nbFrames, 0x0028, 0x0008);
    }
-         
-   f1->GetHeader()->ReplaceOrCreateByNumber(
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0010), 0x0028, 0x0010);// nbLig
-   f1->GetHeader()->ReplaceOrCreateByNumber( 
-      f2->GetHeader()->GetEntryByNumber(0x0028, 0x0011), 0x0028, 0x0011);// nbCol
-
 
-// sans doute d'autres à mettre à jour...
-
-// TODO : rajouter une valeur par defaut.
-// TODO : une routine qui recoit une liste de couples (gr,el), 
-//                        et qui fasse le boulot.
 
+// WARNING : If user tries to 'merge' two mismatching images
+// e.g. a LUT image and a RGB image
+// or a compressed and an uncompressed one
+// or a single frame and a multiframe,
+// or a '12 Bits Allocated' image and anything else, etc
+// Probabely TestChangeHeader will fail !
+// 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()->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
+// TODO : add a method that receives a list of pairs  (gr,el), 
+//                        and that does the work.
 
    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 : ne devrait-on pas fusionner ces 2 fonctions ?
    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());