X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=bfae6f1a2715215fa5de2029657343d3a16091ef;hb=6acf56f6020297bbbc69362aa45ff363531560c4;hp=819d70b787e0c71705072c2d15a57e4e5d876da5;hpb=05a8ef5406eb1d78b0a43a714b41656a297a7f3c;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 819d70b7..bfae6f1a 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -2,9 +2,8 @@
 #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,7 +11,7 @@ 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;
    }
 
@@ -24,32 +23,48 @@ int TestChangeHeader(int argc, char* argv[])
 
    //f1->PrintPubElVal();
 
-   // On suppose que les champs DICOM du 2ieme fichier existent *effectivement*
+   // We suppose the DICOM Entries of the second file *do* exist !
 
    std::string nbFrames = f2->GetHeader()->GetEntryByNumber(0x0028, 0x0008);
    if(nbFrames != "gdcm::Unfound")
    {
       f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
    }
+
+
+// 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()->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
+// Probabely some more to update (?)
 
-
-// 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.
-
+// 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();
 
-// TODO : ne devrait-on pas fusionner ces 2 fonctions ?
+// TODO : Why don't we merge theese 2 functions ?
+
    f1->SetImageData(imageData,dataSize);
    f1->GetHeader()->SetImageDataSize(dataSize);