X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FWrite.cxx;h=023b54dd638728a643a110a24fe67f149cb34793;hb=a1632352fa2c6d5bbc306d8bbf70511eac325324;hp=b9632bda2a4da7a581ce57e53908b364972ba511;hpb=978f699b97794e209f9d20e2a33a72404bda54ef;p=gdcm.git

diff --git a/Example/Write.cxx b/Example/Write.cxx
index b9632bda..023b54dd 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/11/16 04:26:18 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/01/20 16:31:42 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,17 +15,17 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
+#include "gdcmHeader.h"
+#include "gdcmFileHelper.h"
+
 #include <iostream>
-#include <stdio.h>
-#include "gdcm.h"
 
 int main(int argc, char* argv[])
 {  
-   std::string toto;
-   char zozo[200];
+   std::string zozo;
 
    gdcm::Header* e1;
-   gdcm::File  * f1;
+   gdcm::FileHelper  * f1;
 
    //gdcmDocument * d;  //not used
    uint8_t* imageData;
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
              << "--------------------- file :" << argv[1] 
              << std::endl;
      
-   toto = argv[1]; 
+   std::string toto = argv[1]; 
 
    e1 = new gdcm::Header( toto.c_str() );
    if (!e1->IsReadable()) {
@@ -69,7 +69,7 @@ int main(int argc, char* argv[])
    }
   // e1->Print(); 
    
-   f1 = new gdcm::File(e1);
+   f1 = new gdcm::FileHelper(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -85,39 +85,40 @@ 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->GetEntry(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"
+/*   if (  transferSyntaxName != "Implicit VR - Little Endian"
       && transferSyntaxName != "Explicit VR - Little Endian"     
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
       && transferSyntaxName != "Uncompressed ACR-NEMA"     ) {
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-      f1->GetPixelConverter()->Print();
+      f1->GetPixelReadConverter()->Print();
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-   }
+   }*/
    imageData= f1->GetImageData();
    (void)imageData;  // to avoid warnings
 
-   switch (argv[2][0]) {
+   switch (argv[2][0])
+   {
    case 'a' :
             // ecriture d'un fichier ACR 
             // à partir d'un dcmHeader correct.
 
-      sprintf(zozo, "%s.ACR", toto.c_str());
-      printf ("WriteACR\n");
+      zozo = toto + ".ACR";
+      std::cout << "WriteACR" << std::endl;
       f1->WriteAcr(zozo);
       break;
 
@@ -125,8 +126,8 @@ int main(int argc, char* argv[])
            // ecriture d'un fichier DICOM Implicit VR 
            // à partir d'un dcmHeader correct.
 
-      sprintf(zozo, "%s.DCM", toto.c_str());
-      printf ("WriteDCM Implicit VR\n");
+      zozo = toto + ".DCM";
+      std::cout << "WriteDCM Implicit VR" << std::endl;
       f1->WriteDcmImplVR(zozo);
       break;
 
@@ -134,8 +135,8 @@ int main(int argc, char* argv[])
               // ecriture d'un fichier DICOM Explicit VR 
               // à partir d'un dcmHeader correct.
 
-      sprintf(zozo, "%s.XDCM", toto.c_str());
-      std::cout << "WriteDCM Explicit VR" << std::endl;
+      zozo = toto + ".DCM";
+      std::cout << "WriteDCM Implicit VR" << std::endl;
       f1->WriteDcmExplVR(zozo);
       break;
 
@@ -143,7 +144,7 @@ int main(int argc, char* argv[])
              //  Ecriture d'un Raw File, a afficher avec 
              // affim filein= dimx= dimy= nbit= signe=
 
-      sprintf(zozo, "%s.RAW", toto.c_str());
+      zozo = toto + ".RAW";
       std::cout << "WriteRaw" << std::endl;
       f1->WriteRawData(zozo);
       break;