make output more readable

[gdcm.git] / Testing / TestPrintAllDocument.cxx

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index 26af718ebb4856a4c7e15e47b8ce487afd1215a7..c1580202ae299c3af73dcc92c5874a97043cea8e 100644 (file)
--- a/Testing/TestPrintAllDocument.cxx
+++ b/Testing/TestPrintAllDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestPrintAllDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/01 19:39:15 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/11/18 11:44:33 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,14 +24,12 @@
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "gdcmCommon.h"
-#include "gdcmBinEntry.h"  
 #include "gdcmDocEntry.h" 
 #include "gdcmDocEntrySet.h"           
 #include "gdcmDocument.h"          
 #include "gdcmElementSet.h"        
 #include "gdcmSeqEntry.h" 
 #include "gdcmSQItem.h" 
-#include "gdcmValEntry.h" 
 #include "gdcmOrientation.h"
 #include <fstream>
 #include <iostream>
@@ -55,7 +53,7 @@ int TestPrintAllDocument(int, char *[])
       filename += "/";  //doh!
       filename += gdcmDataImages[i];
 
-      gdcm::File *f= new gdcm::File( );
+      gdcm::File *f= gdcm::File::New( );
       f->SetFileName( filename );
       f->Load();
 
@@ -84,7 +82,7 @@ int TestPrintAllDocument(int, char *[])
       std::cout << " Smpl.P.Pix.="          << f->GetSamplesPerPixel()
                 << " Plan.Config.="         << f->GetPlanarConfiguration();
  
-      photomInterp =  f->GetEntryValue(0x0028,0x0004);               
+      photomInterp =  f->GetEntryString(0x0028,0x0004);               
       std::cout << " Photom.Interp.="       << photomInterp;
       for (j=0; j<l-photomInterp.length(); j++)
          std::cout << " ";
@@ -100,13 +98,15 @@ int TestPrintAllDocument(int, char *[])
       std::cout << std::endl;
 
       std::string strImageOrientationPatient = 
-                                          f->GetEntryValue(0x0020,0x0037);
+                                          f->GetEntryString(0x0020,0x0037);
       if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )
       {
-         gdcm::Orientation o;
-         gdcm::OrientationType orient = o.GetOrientationType( f );
+         gdcm::Orientation *o = gdcm::Orientation::New();
+ 
+         gdcm::OrientationType orient = o->GetOrientationType( f );
          std::cout << " ---------------------- Orientation " << orient
                    << std::endl;
+         o->gdcm::Orientation::Delete(); 
       }
 
       if( f->IsReadable() )
@@ -118,10 +118,10 @@ int TestPrintAllDocument(int, char *[])
       {
          std::cout << filename << " is NOT Readable" 
                    << std::endl << std::endl;
-         delete f;
+         f->Delete();
          return 1;
       }
-      delete f;
+      f->Delete();
       i++;
    }
    return 0;