X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyDicom.cxx;h=7d0b74b969051afa34a873be5665ef237a3326e0;hb=be54aab0103af7dee1a3bb5b8b3ee93b59ca9073;hp=5a3aa14e53be95283d3eb6a6279c5ba565194dc2;hpb=c852120fdb6d542d84f74440b68414fdb52178d7;p=gdcm.git

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index 5a3aa14e..7d0b74b9 100644
--- a/Testing/TestCopyDicom.cxx
+++ b/Testing/TestCopyDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:18 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/24 16:44:54 $
+  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,9 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
-#include "gdcmDocument.h"
+#include "gdcmFileHelper.h"
 #include "gdcmValEntry.h"
 #include "gdcmBinEntry.h"
 
@@ -63,7 +62,6 @@ int CopyDicom(std::string const & filename,
       std::cout << "   Testing: " << filename << std::endl;
       if( FileExists( output.c_str() ) )
       {
-        // std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
          if( !RemoveFile( output.c_str() ) )
          {
             std::cout << "Ouch, the file exist, but I cannot remove it" << std::endl;
@@ -73,96 +71,98 @@ int CopyDicom(std::string const & filename,
 
       //////////////// Step 1:
       std::cout << "      1...";
-      gdcm::File *original = new gdcm::File( filename );
-      gdcm::File *copy = new gdcm::File( output );
-
-      size_t dataSize = original->GetImageDataSizeRaw();
-      uint8_t* imageData = original->GetImageDataRaw();
-      (void)dataSize;  // To use the variable and not have warnings at compil.
-      (void)imageData; // To use the variable and not have warnings at compil.
+      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 Header !)
-      // Waiting for a 'clean' solution, I keep the method ...JPRx
-
 
       //////////////// Step 2:
       std::cout << "2...";
-      original->GetHeader()->Initialize();
-      gdcm::DocEntry* d=original->GetHeader()->GetNextEntry();
-
+      gdcm::DocEntry* d=originalH->GetFirstEntry();
       while(d)
       {
          if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
          {
-            copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 b->GetBinArea(),
-                                 b->GetLength(),
-                                 b->GetGroup(), 
-                                 b->GetElement(),
-                                 b->GetVR() );
+            copyH->Insert( b->GetBinArea(),
+                           b->GetLength(),
+                           b->GetGroup(), 
+                           b->GetElement(),
+                           b->GetVR() );
          }
          else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
          {   
-             copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 v->GetValue(),
-                                 v->GetGroup(), 
-                                 v->GetElement(),
-                                 v->GetVR() ); 
+             copyH->Insert( v->GetValue(),
+                            v->GetGroup(), 
+                            v->GetElement(),
+                            v->GetVR() ); 
          }
          else
          {
           // We skip pb of SQ recursive exploration
-          //std::cout << "Skipped Sequence " 
-          //          << "------------- " << d->GetVR() << " "<< std::hex
-          //          << d->GetGroup() << " " << d->GetElement()
-          //  << std::endl;    
          }
 
-         d=original->GetHeader()->GetNextEntry();
+         d=originalH->GetNextEntry();
       }
 
+      gdcm::FileHelper *original = new gdcm::FileHelper( originalH );
+      gdcm::FileHelper *copy     = new gdcm::FileHelper( copyH );
+
+      size_t dataSize = original->GetImageDataSize();
+      uint8_t* imageData = original->GetImageData();
 
       // Useless to set the image datas, because it's already made when
       // copying the corresponding BinEntry that contains the pixel datas
       copy->SetImageData(imageData, dataSize);
-//      copy->GetImageData();
-//      original->GetHeader()->SetImageDataSize(dataSize);
 
       //////////////// Step 3:
       std::cout << "3...";
-      copy->WriteDcmExplVR( output );
+      copy->SetWriteModeToRGB();
+      if( !copy->WriteDcmExplVR(output) )
+      {
+         std::cout << " Failed" << std::endl
+                   << "       " << output << " not written" << std::endl;
+
+         delete original;
+         delete copy;
+         delete originalH;
+         delete copyH;
+
+         return 1;
+      }
 
       delete copy;
+      delete copyH;
 
       //////////////// Step 4:
       std::cout << "4...";
-      copy = new gdcm::File( output );
+      copy = new gdcm::FileHelper( output );
 
       //Is the file written still gdcm parsable ?
-      if ( !copy->GetHeader()->IsReadable() )
+      if ( !copy->GetFile()->IsReadable() )
       { 
-         std::cout << "=> " << output << " Failed" << std::endl;
+         std::cout << " Failed" << std::endl
+                   << "        " << output << " not readable" << std::endl;
+
          delete original;
-         return(1);
+         delete originalH;
+
+         return 1;
       }
 
       //////////////// Step 5:
       std::cout << "5...";
-      int    dataSizeWritten = copy->GetImageDataSizeRaw();
-      uint8_t* imageDataWritten = copy->GetImageDataRaw();
+      size_t    dataSizeWritten = copy->GetImageDataSize();
+      uint8_t* imageDataWritten = copy->GetImageData();
 
       if (dataSize != dataSizeWritten)
       {
          std::cout << " Failed" << std::endl
-            << "        Pixel areas lengths differ: "
-            << dataSize << " # " << dataSizeWritten << std::endl;
+                   << "        Pixel areas lengths differ: "
+                   << dataSize << " # " << dataSizeWritten << std::endl;
 
          delete original;
          delete copy;
+         delete originalH;
 
          return 1;
       }
@@ -171,10 +171,11 @@ int CopyDicom(std::string const & filename,
       {
          (void)res;
          std::cout << " Failed" << std::endl
-            << "        Pixel differ (as expanded in memory)." << std::endl;
+                   << "        Pixel differ (as expanded in memory)." << std::endl;
 
          delete original;
          delete copy;
+         delete originalH;
 
          return 1;
       }
@@ -182,6 +183,7 @@ int CopyDicom(std::string const & filename,
 
       delete original;
       delete copy;
+      delete originalH;
 
       return 0;
 }
@@ -216,7 +218,7 @@ int TestCopyDicom(int argc, char* argv[])
              << std::endl;
    std::cout << "   apply the following to each filename.xxx: "
              << std::endl;
-   std::cout << "   step 1: parse the image (as gdcmHeader) and call"
+   std::cout << "   step 1: parse the image (as gdcmFile) and call"
              << " IsReadable(). After that, call GetImageData() and "
              << "GetImageDataSize() "
              << std::endl;
@@ -240,7 +242,6 @@ int TestCopyDicom(int argc, char* argv[])
       filename += "/";  //doh!
       filename += gdcmDataImages[i];
 
-//      std::string output = "../Testing/Temporary/output.dcm";
       std::string output = "output.dcm";
 
       if( CopyDicom( filename, output ) != 0 )