X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestPrintAllDocument.cxx;h=5b8db1d62cacd719bbe5f11cdbde9ecaa78567e6;hb=5071bc6d73c22304b8b139d040a02eb3e1f33407;hp=26af718ebb4856a4c7e15e47b8ce487afd1215a7;hpb=06a0fef14384fff540b619069c11e9dfaae2bbc6;p=gdcm.git

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index 26af718e..5b8db1d6 100644
--- 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: 2007/06/22 11:01:58 $
+  Version:   $Revision: 1.17 $
                                                                                 
   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>
@@ -40,29 +38,42 @@
 //Generated file:
 #include "gdcmDataImages.h"
 
-int TestPrintAllDocument(int, char *[])
+int TestPrintAllDocument(int argc, char *argv[])
 {
    //std::ostringstream s;
    int i = 0;
    int swapC;
    unsigned int j;
    std::string pixelType, photomInterp;
-   int l;
+   unsigned int l;
    l = strlen("PALETTE COLOR ");
+   
+   //gdcm::Debug::DebugOn();
+   
    while( gdcmDataImages[i] != 0 )
    {
-      std::string filename = GDCM_DATA_ROOT;
-      filename += "/";  //doh!
-      filename += gdcmDataImages[i];
+      std::string filename;      
+      if (argc ==2)
+      {
+         filename = argv[1];
+      }
+      else
+      {
+         filename = GDCM_DATA_ROOT;
+         filename += "/";  //doh!      
+         filename += gdcmDataImages[i];
+      }
+      
+      std::cout << " ----------------------------------------------"
+                << "Begin with " << filename << std::endl;
 
-      gdcm::File *f= new gdcm::File( );
+      GDCM_NAME_SPACE::File *f= GDCM_NAME_SPACE::File::New( );
       f->SetFileName( filename );
       f->Load();
 
       f->SetPrintLevel(2);
       f->Print();
-      // just to be able to grep the display result, for some usefull info
- 
+      
       //s.setf(std::ios::left);
       //s << std::setw(60-filename.length()) << " ";
       //std::cout << s.str() << gdcmDataImages[i];
@@ -83,11 +94,13 @@ int TestPrintAllDocument(int, char *[])
          std::cout << " ";
       std::cout << " Smpl.P.Pix.="          << f->GetSamplesPerPixel()
                 << " Plan.Config.="         << f->GetPlanarConfiguration();
- 
-      photomInterp =  f->GetEntryValue(0x0028,0x0004);               
-      std::cout << " Photom.Interp.="       << photomInterp;
-      for (j=0; j<l-photomInterp.length(); j++)
-         std::cout << " ";
+
+      photomInterp =  f->GetEntryString(0x0028,0x0004);               
+      std::cout << " Photom.Interp.="       << photomInterp << " l : " << l <<"length : " << photomInterp.length()<< std::endl;
+      
+      if (l > photomInterp.length())
+        for (j=0; j<l-photomInterp.length(); j++)
+           std::cout << " ";
  
       std::cout << " TransferSyntaxName= [" << f->GetTransferSyntaxName() << "]" ;
 
@@ -100,13 +113,15 @@ int TestPrintAllDocument(int, char *[])
       std::cout << std::endl;
 
       std::string strImageOrientationPatient = 
-                                          f->GetEntryValue(0x0020,0x0037);
-      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )
+                                          f->GetEntryString(0x0020,0x0037);
+      if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND )
       {
-         gdcm::Orientation o;
-         gdcm::OrientationType orient = o.GetOrientationType( f );
+         GDCM_NAME_SPACE::Orientation *o = GDCM_NAME_SPACE::Orientation::New();
+ 
+         GDCM_NAME_SPACE::OrientationType orient = o->GetOrientationType( f );
          std::cout << " ---------------------- Orientation " << orient
                    << std::endl;
+         o->Delete(); 
       }
 
       if( f->IsReadable() )
@@ -118,10 +133,14 @@ int TestPrintAllDocument(int, char *[])
       {
          std::cout << filename << " is NOT Readable" 
                    << std::endl << std::endl;
-         delete f;
+         f->Delete();
          return 1;
       }
-      delete f;
+      f->Delete();
+      
+      if (argc ==2)
+         break; // user asked to check a single file.      
+      
       i++;
    }
    return 0;