X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestFromScratch.cxx;h=20f52c074b6670823857915ef4b314fd3b45209f;hb=c227f2b6e0b17c14620f47a8110d17b44188288b;hp=35851cde2698a7df0c980f2ac1f26fdc7f690b7d;hpb=a2040ffd26fc9a3c835b6c45b92a808f1d001b36;p=gdcm.git

diff --git a/Example/TestFromScratch.cxx b/Example/TestFromScratch.cxx
index 35851cde..20f52c07 100644
--- a/Example/TestFromScratch.cxx
+++ b/Example/TestFromScratch.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestFromScratch.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/05 15:38:28 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/07/08 12:02:02 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 #include "gdcmDictEntry.h"
 #include "gdcmDocEntry.h"
 #include "gdcmBinEntry.h"
@@ -35,40 +35,40 @@ int main(int argc, char *argv[])
       return 1;
    }
 
-   // Doesn't seems to do anything:
-   dbg.SetDebug(-1);
+
+   // Doesn't seem to do anything:
+   gdcm::Debug::DebugOn();
+
    // Doesn't link properly:
    //gdcm::Debug::GetReference().SetDebug(1);
 
    std::string filename = argv[1];
-   //gdcm::File *f1 = new gdcm::File( "/home/malaterre/Creatis/gdcmData/012345.002.050.dcm" );
-   gdcm::File *f1 = new gdcm::File( filename );
-   gdcm::Header *h1 = f1->GetHeader();
+   gdcm::File *h1 = new gdcm::File();
+   h1->SetFileName( filename );
+   h1->Load( );
+   gdcm::FileHelper *f1 = new gdcm::FileHelper( h1 );
+   
 
    int dataSize = f1->GetImageDataSize();
    std::cout << "DataSize:      " << dataSize << std::endl;
    // Since we know the image is 16bits:
-   uint8_t* imageData = f1->GetImageData();
+   uint8_t *imageData = f1->GetImageData();
  
    // Hopefully default to something
-   gdcm::Header *h2 = new gdcm::Header();
-
-   h1->Initialize();
-   gdcm::DocEntry* d = h1->GetNextEntry();
+   gdcm::File *h2 = new gdcm::File();
 
    // Copy of the header content
+   gdcm::DocEntry *d = h1->GetFirstEntry();
    while(d)
    {
-      if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
+      if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
       {   
          // Do not bother with field from private dict
          if( v->GetName() != "gdcm::Unknown" )
          {  
-            h2->ReplaceOrCreateByNumber( 
-                              v->GetValue(),
-                              v->GetGroup(), 
-                              v->GetElement(),
-                              v->GetVR() ); 
+            h2->InsertValEntry( v->GetValue(),
+                                v->GetGroup(),v->GetElement(),
+                                v->GetVR() ); 
          }
       }
       //else
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
    }
    h2->Print( std::cout );
 
-   gdcm::File *f2 = new gdcm::File( h2 );
+   gdcm::FileHelper *f2 = new gdcm::FileHelper( h2 );
    f2->SetImageData(imageData, dataSize);
 
    f2->SetWriteTypeToDcmExplVR();
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
 
    delete f1;
    delete f2;
+   delete h1;
    delete h2;
 
    return 0;