X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FWrite.cxx;h=d2b6ca10c2d4b67dbe9e17b83335346c86a18cfe;hb=1ce6ae86daabc8b64c9309acce4ecf137ee79f07;hp=492506bf4381575279c839dad3b4d177d8611e1f;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git

diff --git a/Example/Write.cxx b/Example/Write.cxx
index 492506bf..d2b6ca10 100644
--- a/Example/Write.cxx
+++ b/Example/Write.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Write.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:55 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/01/24 16:10:49 $
+  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 <iostream>
 
@@ -24,8 +24,8 @@ int main(int argc, char* argv[])
 {  
    std::string zozo;
 
-   gdcm::Header* e1;
-   gdcm::File  * f1;
+   gdcm::File* e1;
+   gdcm::FileHelper  * f1;
 
    //gdcmDocument * d;  //not used
    uint8_t* imageData;
@@ -42,13 +42,13 @@ int main(int argc, char* argv[])
    }
 /*
    if (0) {  // Just to keep the code for further use
-      std::cout <<std::endl << "-------- Test gdcmHeader ------" <<std::endl;
-      e1 = new gdcmHeaderHelper(argv[1]);
-      if (!f1->GetHeader()->IsReadable()) {
+      std::cout <<std::endl << "-------- Test gdcmFile ------" <<std::endl;
+      e1 = new gdcmFileHelper(argv[1]);
+      if (!f1->GetFile()->IsReadable()) {
          std::cout << "Sorry, not a DICOM / ACR File"  <<std::endl;
          exit(0);
       }
-      std::cout << std::endl << "----------------------> after new gdcmHeader"
+      std::cout << std::endl << "----------------------> after new gdcmFile"
                 << std::endl;
       e1->PrintEntry();
       std::cout <<std::endl <<"---------------------------------------" 
@@ -62,14 +62,14 @@ int main(int argc, char* argv[])
      
    std::string toto = argv[1]; 
 
-   e1 = new gdcm::Header( toto.c_str() );
+   e1 = new gdcm::File( toto.c_str() );
    if (!e1->IsReadable()) {
        std::cerr << "Sorry, not a Readable DICOM / ACR File"  <<std::endl;
        return 0;
    }
   // e1->Print(); 
    
-   f1 = new gdcm::File(e1);
+   f1 = new gdcm::FileHelper(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -85,16 +85,16 @@ int main(int argc, char* argv[])
    sPP          = e1->GetSamplesPerPixel();
    planarConfig = e1->GetPlanarConfiguration();
    
-   std::cout << " pixelType="           << pixelType 
+   std::cout << " pixelType="           << pixelType
              << " SampleserPixel="      << sPP
              << " PlanarConfiguration=" << planarConfig 
              << " PhotometricInterpretation=" 
-                                << e1->GetEntryByNumber(0x0028,0x0004) 
+                                << e1->GetEntryValue(0x0028,0x0004) 
              << std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
    std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
-   transferSyntaxName = e1->GetTransfertSyntaxName();
+   transferSyntaxName = e1->GetTransferSyntaxName();
    std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
    
 /*   if (  transferSyntaxName != "Implicit VR - Little Endian"
@@ -115,7 +115,7 @@ int main(int argc, char* argv[])
    {
    case 'a' :
             // ecriture d'un fichier ACR 
-            // à partir d'un dcmHeader correct.
+            // à partir d'un dcmFile correct.
 
       zozo = toto + ".ACR";
       std::cout << "WriteACR" << std::endl;
@@ -124,7 +124,7 @@ int main(int argc, char* argv[])
 
    case 'd' :
            // ecriture d'un fichier DICOM Implicit VR 
-           // à partir d'un dcmHeader correct.
+           // à partir d'un dcmFile correct.
 
       zozo = toto + ".DCM";
       std::cout << "WriteDCM Implicit VR" << std::endl;
@@ -133,7 +133,7 @@ int main(int argc, char* argv[])
 
    case 'x' :
               // ecriture d'un fichier DICOM Explicit VR 
-              // à partir d'un dcmHeader correct.
+              // à partir d'un dcmFile correct.
 
       zozo = toto + ".DCM";
       std::cout << "WriteDCM Implicit VR" << std::endl;