* Correctly use the VRKey for all vr variables... instead of TagName

[gdcm.git] / Example / TestCopyDicom.cxx

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index 37005844279a0d24147f1e743704dfce9b822667..081c58c1ee7da1ddd4c7394830048f009661ace7 100644 (file)
--- a/Example/TestCopyDicom.cxx
+++ b/Example/TestCopyDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:44:53 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/10/18 08:35:43 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,8 +18,7 @@
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 
 #ifndef _WIN32
 #include <unistd.h> //for access, unlink
@@ -28,7 +27,7 @@
 #endif
 
 // return true if the file exists
-bool FileExists(const char* filename)
+bool FileExists(const char *filename)
 {
 #ifdef _MSC_VER
 # define access _access
@@ -46,7 +45,7 @@ bool FileExists(const char* filename)
     }
 }
 
-bool RemoveFile(const char* source)
+bool RemoveFile(const char *source)
 {
 #ifdef _MSC_VER
 #define _unlink unlink
@@ -57,7 +56,7 @@ bool RemoveFile(const char* source)
 // Here we load a gdcmFile and then try to create from scratch a copy of it,
 // copying field by field the dicom image
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
    if (argc < 3)
    {
@@ -73,59 +72,56 @@ int main(int argc, char* argv[])
 
       if( FileExists( output.c_str() ) )
       {
-         std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
+         std::cerr << "Don't try to cheat, I am removing the file anyway" 
+                   << std::endl;
          if( !RemoveFile( output.c_str() ) )
          {
-            std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl;
+            std::cerr << "Ouch, the file exist, but I cannot remove it" 
+                      << std::endl;
             return 1;
          }
       }
-      gdcm::FileHelper *original = new gdcm::FileHelper( filename );
+      gdcm::File *fileOr = new gdcm::File();
+      fileOr->SetFileName( filename );
+      fileOr->Load();
+      gdcm::FileHelper *original = new gdcm::FileHelper( fileOr );
    
       std::cout << "--- Original ----------------------" << std::endl;
       //original->GetFile()->Print();
    
-      gdcm::FileHelper *copy = new gdcm::FileHelper( output );
-
-      size_t dataSize = original->GetImageDataSize();
-      uint8_t* imageData = original->GetImageData();
-      (void)imageData;
-      (void)dataSize;
+      gdcm::FileHelper *copy = new gdcm::FileHelper( );
+      copy->SetFileName( output );
+      copy->Load();
+
+      //size_t dataSize;
+      uint8_t *imageData;
+      //dataSize = original->GetImageDataSize();// just an accesor :useless here
+      
+      imageData = original->GetImageData(); // VERY important : 
+                                      // brings pixels into memory !
+      //(void)imageData; // not enough to avoid warning with icc compiler
+      //(void)dataSize; //  not enough to avoid warning on 'Golgot'
   
+      std::cout << imageData << std::endl; // to avoid warning ?
+
       //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::DocEntry* d=original->GetFile()->GetFirstEntry();
+      gdcm::DocEntry *d = original->GetFile()->GetFirstEntry();
       while(d)
       {
-         if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
+         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
          {              
-            copy->GetFile()->Insert( 
-                                 b->GetBinArea(),
-                                 b->GetLength(),
-                                 b->GetGroup(), 
-                                 b->GetElement(),
-                                 b->GetVR() );
-         }
-         else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
-         {   
-            copy->GetFile()->Insert( 
-                                 v->GetValue(),
-                                 v->GetGroup(), 
-                                 v->GetElement(),
-                                 v->GetVR() ); 
+            copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+                                                 de->GetGroup(),de->GetElement(),
+                                                 de->GetVR() );
          }
          else
          {
           // We skip pb of SQ recursive exploration
-          //std::cout << "Skipped Sequence " 
-          //          << "------------- " << d->GetVR() << " "<< std::hex
-          //          << d->GetGroup() << " " << d->GetElement()
-          //  << std::endl;    
+          std::cout << "Skipped Sequence " 
+                    << "------------- " << d->GetVR() << " "<< std::hex
+                    << d->GetGroup() << "," << d->GetElement()
+                    << std::endl;    
          }
 
          d=original->GetFile()->GetNextEntry();
@@ -135,12 +131,17 @@ int main(int argc, char* argv[])
       //copy->SetImageData(imageData, dataSize);
 
       std::cout << "--- Copy ----------------------" << std::endl;
-      std::cout <<std::endl << "DO NOT care about Offset"  <<std::endl<<std::endl;; 
+      std::cout <<std::endl << "DO NOT care about Offset"  
+                <<std::endl << std::endl;; 
       copy->GetFile()->Print();
       std::cout << "--- ---- ----------------------" << std::endl;
    
       copy->WriteDcmExplVR( output );
+      
 
+      delete fileOr;   // File
+      delete original; // FileHelper
+      delete copy;     // FileHelper
       return 0;
 }