Name normalization

[gdcm.git] / Example / Write.cxx

diff --git a/Example/Write.cxx b/Example/Write.cxx
index bec3f306b4c6fb0f99159b4a89673641162db8ba..5a864870b57fd9b14d5dd002f25b2c624d1e450c 100644 (file)
--- a/Example/Write.cxx
+++ b/Example/Write.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Write.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:16:58 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/02/02 10:06:32 $
+  Version:   $Revision: 1.19 $
                                                                                 
   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,19 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
 #include <iostream>
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {  
-   std::string zozo;
+   std::string FileNameToWrite;
 
-   gdcm::Header* e1;
-   gdcm::FileHelper  * f1;
+   gdcm::File *e1;
+   gdcm::FileHelper *f1;
 
-   //gdcmDocument * d;  //not used
-   uint8_t* imageData;
+   uint8_t *imageData;
    int dataSize;
 
    if (argc < 3) {
@@ -42,13 +41,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 <<"---------------------------------------" 
@@ -60,9 +59,9 @@ int main(int argc, char* argv[])
              << "--------------------- file :" << argv[1] 
              << std::endl;
      
-   std::string toto = argv[1]; 
+   std::string FileName = argv[1]; 
 
-   e1 = new gdcm::Header( toto.c_str() );
+   e1 = new gdcm::File( FileName.c_str() );
    if (!e1->IsReadable()) {
        std::cerr << "Sorry, not a Readable DICOM / ACR File"  <<std::endl;
        return 0;
@@ -89,7 +88,7 @@ int main(int argc, char* argv[])
              << " SampleserPixel="      << sPP
              << " PlanarConfiguration=" << planarConfig 
              << " PhotometricInterpretation=" 
-                                << e1->GetEntry(0x0028,0x0004) 
+                                << e1->GetEntryValue(0x0028,0x0004) 
              << std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
@@ -115,38 +114,38 @@ 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";
+      FileNameToWrite = FileName + ".ACR";
       std::cout << "WriteACR" << std::endl;
-      f1->WriteAcr(zozo);
+      f1->WriteAcr(FileNameToWrite);
       break;
 
    case 'd' :
            // ecriture d'un fichier DICOM Implicit VR 
-           // à partir d'un dcmHeader correct.
+           // à partir d'un dcmFile correct.
 
-      zozo = toto + ".DCM";
+      FileNameToWrite = FileName + ".DCM";
       std::cout << "WriteDCM Implicit VR" << std::endl;
-      f1->WriteDcmImplVR(zozo);
+      f1->WriteDcmImplVR(FileNameToWrite);
       break;
 
    case 'x' :
               // ecriture d'un fichier DICOM Explicit VR 
-              // à partir d'un dcmHeader correct.
+              // à partir d'un dcmFile correct.
 
-      zozo = toto + ".DCM";
+      FileNameToWrite = FileName + ".DCM";
       std::cout << "WriteDCM Implicit VR" << std::endl;
-      f1->WriteDcmExplVR(zozo);
+      f1->WriteDcmExplVR(FileNameToWrite);
       break;
 
    case 'r' :
              //  Ecriture d'un Raw File, a afficher avec 
              // affim filein= dimx= dimy= nbit= signe=
 
-      zozo = toto + ".RAW";
+      FileNameToWrite = FileName + ".RAW";
       std::cout << "WriteRaw" << std::endl;
-      f1->WriteRawData(zozo);
+      f1->WriteRawData(FileNameToWrite);
       break;
 
    }