X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=dc9b2a9244e4db63308419364fbcc626e29a4adf;hb=059cb99a9d4278de4030a1702d2e391ac1b462fd;hp=275c532776cb1f2b0ba862abede8ee210cde0c61;hpb=c094e185dd6404df031524ccae8e1b51e3b84871;p=gdcm.git

diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx
index 275c5327..dc9b2a92 100644
--- a/Testing/TestCopyRescaleDicom.cxx
+++ b/Testing/TestCopyRescaleDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyRescaleDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/21 11:40:54 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/01/26 16:43:10 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,64 +43,53 @@ int CopyRescaleDicom(std::string const & filename,
 
    //////////////// Step 1:
    std::cout << "      1...";
-   gdcm::File *originalH = new gdcm::File( filename );
-   gdcm::File *copyH     = new gdcm::File( );
-
-   //First of all copy the header field by field
-
-   // Warning :Accessor gdcmElementSet::GetEntry() should not exist 
-   // It was commented out by Mathieu, that was a *good* idea
-   // (the user does NOT have to know the way we implemented the File !)
-   // Waiting for a 'clean' solution, I keep the method ...JPRx
+   gdcm::File *originalF = new gdcm::File( filename );
+   gdcm::File *copyF     = new gdcm::File( );
 
+   //First of all copy the file, field by field
 
    //////////////// Step 2:
    std::cout << "2...";
    // Copy of the header content
-   gdcm::DocEntry* d = originalH->GetFirstEntry();
+   gdcm::DocEntry* d = originalF->GetFirstEntry();
    while(d)
    {
       if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
       {
-         copyH->ReplaceOrCreate( 
-                              b->GetBinArea(),
-                              b->GetLength(),
-                              b->GetGroup(), 
-                              b->GetElement(),
-                              b->GetVR() );
+         copyF->InsertBinEntry( b->GetBinArea(),b->GetLength(),
+                                b->GetGroup(),b->GetElement(),
+                                b->GetVR() );
       }
       else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
       {   
-          copyH->ReplaceOrCreate( 
-                              v->GetValue(),
-                              v->GetGroup(), 
-                              v->GetElement(),
-                              v->GetVR() ); 
+          copyF->InsertValEntry( v->GetValue(),
+                                 v->GetGroup(),v->GetElement(),
+                                 v->GetVR() ); 
       }
       else
       {
        // We skip pb of SQ recursive exploration
       }
 
-      d=originalH->GetNextEntry();
+      d=originalF->GetNextEntry();
    }
 
-   gdcm::FileHelper *original = new gdcm::FileHelper( originalH );
-   gdcm::FileHelper *copy     = new gdcm::FileHelper( copyH );
+   gdcm::FileHelper *original = new gdcm::FileHelper( originalF );
+   gdcm::FileHelper *copy     = new gdcm::FileHelper( copyF );
 
    size_t dataSize = original->GetImageDataSize();
 
    size_t rescaleSize;
    uint8_t *rescaleImage;
 
-   const std::string & bitsStored    = originalH->GetEntry(0x0028,0x0101);
+   const std::string & bitsStored    = originalF->GetEntryValue(0x0028,0x0101);
    if( bitsStored == "16" )
    {
       std::cout << "Rescale...";
-      copyH->ReplaceOrCreate( "8", 0x0028, 0x0100); // BitsAllocated
-      copyH->ReplaceOrCreate( "8", 0x0028, 0x0101); // BitsStored
-      copyH->ReplaceOrCreate( "7", 0x0028, 0x0102); // HighBit
-      copyH->ReplaceOrCreate( "0", 0x0028, 0x0103); //Pixel Representation
+      copyF->InsertValEntry( "8", 0x0028, 0x0100); // BitsAllocated
+      copyF->InsertValEntry( "8", 0x0028, 0x0101); // BitsStored
+      copyF->InsertValEntry( "7", 0x0028, 0x0102); // HighBit
+      copyF->InsertValEntry( "0", 0x0028, 0x0103); //Pixel Representation
  
       // We assume the value were from 0 to uint16_t max
       rescaleSize = dataSize / 2;
@@ -132,15 +121,15 @@ int CopyRescaleDicom(std::string const & filename,
 
       delete original;
       delete copy;
-      delete originalH;
-      delete copyH;
+      delete originalF;
+      delete copyF;
       delete[] rescaleImage;
 
       return 1;
    }
 
    delete copy;
-   delete copyH;
+   delete copyF;
 
    //////////////// Step 4:
    std::cout << "4...";
@@ -153,7 +142,7 @@ int CopyRescaleDicom(std::string const & filename,
                 << "        " << output << " not readable" << std::endl;
 
       delete original;
-      delete originalH;
+      delete originalF;
       delete[] rescaleImage;
 
       return 1;
@@ -164,21 +153,21 @@ int CopyRescaleDicom(std::string const & filename,
    size_t    dataSizeWritten = copy->GetImageDataSize();
    uint8_t* imageDataWritten = copy->GetImageData();
 
-   if (originalH->GetXSize() != copy->GetFile()->GetXSize() ||
-       originalH->GetYSize() != copy->GetFile()->GetYSize() ||
-       originalH->GetZSize() != copy->GetFile()->GetZSize())
+   if (originalF->GetXSize() != copy->GetFile()->GetXSize() ||
+       originalF->GetYSize() != copy->GetFile()->GetYSize() ||
+       originalF->GetZSize() != copy->GetFile()->GetZSize())
    {
       std::cout << "Failed" << std::endl
          << "        X Size differs: "
-         << "X: " << originalH->GetXSize() << " # " 
+         << "X: " << originalF->GetXSize() << " # " 
                   << copy->GetFile()->GetXSize() << " | "
-         << "Y: " << originalH->GetYSize() << " # " 
+         << "Y: " << originalF->GetYSize() << " # " 
                   << copy->GetFile()->GetYSize() << " | "
-         << "Z: " << originalH->GetZSize() << " # " 
+         << "Z: " << originalF->GetZSize() << " # " 
                   << copy->GetFile()->GetZSize() << std::endl;
       delete original;
       delete copy;
-      delete originalH;
+      delete originalF;
       delete[] rescaleImage;
 
       return 1;
@@ -192,7 +181,7 @@ int CopyRescaleDicom(std::string const & filename,
 
       delete original;
       delete copy;
-      delete originalH;
+      delete originalF;
       delete[] rescaleImage;
 
       return 1;
@@ -206,7 +195,7 @@ int CopyRescaleDicom(std::string const & filename,
 
       delete original;
       delete copy;
-      delete originalH;
+      delete originalF;
       delete[] rescaleImage;
 
       return 1;
@@ -215,7 +204,7 @@ int CopyRescaleDicom(std::string const & filename,
 
    delete original;
    delete copy;
-   delete originalH;
+   delete originalF;
    delete[] rescaleImage;
 
    return 0;
@@ -256,7 +245,7 @@ int TestCopyRescaleDicom(int argc, char* argv[])
              << "GetImageDataSize() "
              << std::endl;
    std::cout << "   step 2: create a copy of the readed file and the new"
-             << " pixel datas are set to the copy"
+             << " pixel data are set to the copy"
              << std::endl;
    std::cout << "   step 3: write the copy of the image"
              << std::endl;