X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=554f3a5c72a1d87b7b3526ef14369379315a40c1;hb=bbfa3cf89fc2ede7c43259e945f021044b56069f;hp=e94b5a991737f8da38077f7c07a98efdf68c2b35;hpb=dbcde8e6df2bcc9eef8a249111a500f289214ace;p=gdcm.git

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index e94b5a99..554f3a5c 100644
--- a/Example/TestCopyDicom.cxx
+++ b/Example/TestCopyDicom.cxx
@@ -1,14 +1,34 @@
-#include "gdcmHeader.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestCopyDicom.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/02/02 14:26:30 $
+  Version:   $Revision: 1.24 $
+                                                                                
+  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 "gdcmFile.h"
+#include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
 #include "gdcmValEntry.h"
+#include "gdcmBinEntry.h"
 
 #ifndef _WIN32
-#include <unistd.h>
+#include <unistd.h> //for access, unlink
+#else
+#include <io.h> //for _access
 #endif
 
 // return true if the file exists
-bool FileExists(const char* filename)
+bool FileExists(const char *filename)
 {
 #ifdef _MSC_VER
 # define access _access
@@ -26,7 +46,7 @@ bool FileExists(const char* filename)
     }
 }
 
-bool RemoveFile(const char* source)
+bool RemoveFile(const char *source)
 {
 #ifdef _MSC_VER
 #define _unlink unlink
@@ -37,7 +57,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)
    {
@@ -46,75 +66,72 @@ int main(int argc, char* argv[])
       return 1;
    }
 
-   if( FileExists( argv[2] ) )
-   {
-      std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
-      if( !RemoveFile( argv[2] ) )
+// don't modify identation in order to let this source xdiffable with ../Test
+
+      std::string filename = argv[1];
+      std::string output = argv[2];
+
+      if( FileExists( output.c_str() ) )
       {
-         std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl;
-         return 1;
+         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;
+            return 1;
+         }
       }
-   }
-   gdcmFile *original = new gdcmFile( argv[1] );
+      gdcm::FileHelper *original = new gdcm::FileHelper( filename );
    
-   std::cout << "--- Original ----------------------" << std::endl;
-   //original->GetHeader()->Print();
+      std::cout << "--- Original ----------------------" << std::endl;
+      //original->GetFile()->Print();
    
-   gdcmFile *copy = new gdcmFile( argv[2] );
+      gdcm::FileHelper *copy = new gdcm::FileHelper( output );
 
-   //First of all copy the header field by field
+      size_t dataSize = original->GetImageDataSize();
+      uint8_t *imageData = original->GetImageData();
+      (void)imageData;
+      (void)dataSize;
   
-   // 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 !)
-    
-   TagDocEntryHT & Ht = original->GetHeader()->GetEntry();   
-   
-   for (TagDocEntryHT::iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
-   {
-      if (tag->second->GetVR() == "SQ") //to skip pb of SQ recursive exploration
-         continue;
-
-      //According to JPR I should also skip those:
-      if (tag->second->GetVR() == "unkn") //to skip pb of SQ recursive exploration
-         continue;
-
-      std::string value = ((gdcmValEntry*)(tag->second))->GetValue();
-      if( value.find( "gdcm::NotLoaded" ) != 0 )
-         continue;
-
-// the following produce a seg fault at write time:
-//      if( value.find( "gdcm::Loaded" ) != 0 )
-//         continue;
-
-      //std::cerr << "Reading: " << tag->second->GetVR() << std::endl;
-      //tag->second->Print(); std::cout << std::endl;
-    
-      //std::cerr << "Reading: " << value  << std::endl;
-
-      // Well ... Should have dynamic cast here 
-      copy->GetHeader()->ReplaceOrCreateByNumber( 
-                                 value,
-                                 tag->second->GetGroup(), 
-                                 tag->second->GetElement() );
-   
-     // todo : Setting Offset to 0 to avoid further missprint 
-   }
+      //First of all copy the header field by field
 
-   size_t dataSize = original->GetImageDataSize();
-   void *imageData = original->GetImageData();
+      gdcm::DocEntry *d = original->GetFile()->GetFirstEntry();
+      while(d)
+      {
+         if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+         {              
+            copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
+                                             b->GetGroup(),b->GetElement(),
+                                             b->GetVR() );
+         }
+         else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
+         {   
+            copy->GetFile()->InsertValEntry( 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->GetFile()->GetNextEntry();
+      }
 
-   copy->GetImageData();
-   copy->SetImageData(imageData, dataSize);
+      //copy->GetImageData();
+      //copy->SetImageData(imageData, dataSize);
 
-   std::cout << "--- Copy ----------------------" << std::endl;
-   std::cout <<std::endl << "DO NOT care about Offset"  <<std::endl<<std::endl;; 
-   //copy->GetHeader()->Print();
-   std::cout << "--- ---- ----------------------" << std::endl;
+      std::cout << "--- Copy ----------------------" << std::endl;
+      std::cout <<std::endl << "DO NOT care about Offset"  <<std::endl<<std::endl;; 
+      copy->GetFile()->Print();
+      std::cout << "--- ---- ----------------------" << std::endl;
    
-   copy->WriteDcmExplVR( argv[2] );
+      copy->WriteDcmExplVR( output );
 
-   return 0;
+      return 0;
 }