First stage of name normalisation : gdcm::File replace by gdcm::FileHelper

[gdcm.git] / Example / TestWrite.cxx

diff --git a/Example/TestWrite.cxx b/Example/TestWrite.cxx
index 3355ed4339b55d8478329c0448f5c167fab1a99e..4c4607c9d4d3533b96ed776f0924e113fe4bdd61 100644 (file)
--- a/Example/TestWrite.cxx
+++ b/Example/TestWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 11:55:37 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/01/20 16:16:58 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,20 +15,18 @@
      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[])
+int main(int argc, char *argv[])
 {  
-   std::string toto;
-   char zozo[200];
-
+   std::string zozo;
 
-   gdcm::Header* e1;
-   gdcm::File  * f1;
+   gdcm::Header *e1;
+   gdcm::FileHelper *f1;
 
-   //gdcmDocument * d;  //not used
    void* imageData;
    int dataSize;
 
@@ -64,7 +62,8 @@ int main(int argc, char* argv[])
              << "--------------------- file :" << argv[1] 
              << std::endl;
      
-   toto = argv[1]; 
+   std::string toto = argv[1]; 
+   std::string mode = argv[2];
 
    e1 = new gdcm::Header( toto.c_str() );
    if (!e1->IsReadable())
@@ -74,7 +73,7 @@ int main(int argc, char* argv[])
    }
   // e1->Print(); 
    
-   f1 = new gdcm::File(e1);
+   f1 = new gdcm::FileHelper(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -94,12 +93,12 @@ int main(int argc, char* argv[])
              << " 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"
@@ -115,13 +114,14 @@ int main(int argc, char* argv[])
    }*/
    imageData= f1->GetImageData();
 
-   switch (argv[2][0]) {
+   switch (mode[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;
 
@@ -130,8 +130,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;
 
@@ -139,7 +139,7 @@ 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());
+      zozo = toto + ".XDCM";
       std::cout << "WriteDCM Explicit VR" << std::endl;
       f1->WriteDcmExplVR(zozo);
       break;
@@ -148,7 +148,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;
@@ -171,8 +171,8 @@ int main(int argc, char* argv[])
            ((uint16_t*)imageData)[i] += 60000; //32767;
         }
      }
-     sprintf(zozo, "%s.VDCM", toto.c_str());
-     printf ("WriteDCM Explicit VR + VideoInv\n");
+     zozo = toto + ".VDCM";
+     std::cout << "WriteDCM Explicit VR + VideoInv" << std::endl;
      f1->WriteDcmExplVR(zozo);
      break;