X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FTestCopyDicom.cxx;h=f93ce53ec1068012d6f831b4a7056e4f47d676b0;hb=0fd97a2f44764117b637de53e09b8a329ca133f8;hp=f7139f88615de71ca356d631ef773183736a5f2a;hpb=5dd999e6394b31ea3b040e8cd71563dc1951c23c;p=gdcm.git

diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx
index f7139f88..f93ce53e 100644
--- a/Example/TestCopyDicom.cxx
+++ b/Example/TestCopyDicom.cxx
@@ -2,9 +2,12 @@
 #include "gdcmFile.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
@@ -46,74 +49,87 @@ 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::File *original = new gdcm::File( filename );
    
-   std::cout << "--- Original ----------------------" << std::endl;
-   //original->GetHeader()->Print();
+      std::cout << "--- Original ----------------------" << std::endl;
+      //original->GetHeader()->Print();
    
-   gdcmFile *copy = new gdcmFile( argv[2] );
+      gdcm::File *copy = new gdcm::File( output );
+
+      const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT();
 
-   //First of all copy the header field by field
+      size_t dataSize = original->GetImageDataSize();
+      uint8_t* imageData = original->GetImageData();
   
-   // 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;
-
-      std::string value = ((gdcmValEntry*)(tag->second))->GetValue();
-      //According to JPR I should also skip those:
-//      if (tag->second->GetVR() == "unkn") //to skip pb of SQ recursive exploration
-//         continue;
-
-//      if( value.find( "gdcm::NotLoaded" ) == 0 )
-//         continue;
-
-      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
+  
+      // 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
+
+      gdcm::DocEntry* d;
+
+      for (gdcm::TagDocEntryHT::const_iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
+      {
+         d = tag->second;
+         d->Print(); std::cout << std::endl;
+         if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
+         {              
+            copy->GetHeader()->ReplaceOrCreateByNumber( 
+                                 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() ); 
+         }
+         else
+         {
+          // We skip pb of SQ recursive exploration
+          //std::cout << "Skipped Sequence " 
+          //          << "------------- " << d->GetVR() << " "<< std::hex
+          //          << d->GetGroup() << " " << d->GetElement()
+          //  << std::endl;    
+         }
+      }
+
+
+
 
-   size_t dataSize = original->GetImageDataSize();
-   void *imageData = original->GetImageData();
 
-   //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->GetHeader()->Print();
+      std::cout << "--- ---- ----------------------" << std::endl;
    
-   copy->WriteDcmExplVR( argv[2] );
+      copy->WriteDcmExplVR( output );
 
-   return 0;
+      return 0;
 }