Insert the original Python code, as a comment, to help debug stage

[gdcm.git] / Testing / TestPrintAllDocument.cxx

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index d185ad73bc98f4b323029b0b0012b9a9f2f7c43f..2122494fec91e46b6d52df44ba212cac1ada708b 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/06/02 09:38:53 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/09/07 08:48:28 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,6 +45,7 @@ int TestPrintAllDocument(int, char *[])
    //std::ostringstream s;
    int i = 0;
    int swapC;
+   unsigned int j;
    std::string pixelType, photomInterp;
    int l;
    l = strlen("PALETTE COLOR ");
@@ -54,7 +55,10 @@ int TestPrintAllDocument(int, char *[])
       filename += "/";  //doh!
       filename += gdcmDataImages[i];
 
-      gdcm::File *e1= new gdcm::File( filename );
+      gdcm::File *e1= new gdcm::File( );
+      e1->SetFileName( filename );
+      e1->Load();
+
       e1->SetPrintLevel(2);
       e1->Print();
       // just to be able to grep the display result, for some usefull info
@@ -64,24 +68,31 @@ int TestPrintAllDocument(int, char *[])
       //std::cout << s.str() << gdcmDataImages[i];
 
       std::cout << gdcmDataImages[i];
-      for (unsigned int j=0; j<60-strlen(gdcmDataImages[i]); j++)
+
+      unsigned int nbSpaces;
+      if (strlen(gdcmDataImages[i]) <= 60)
+         nbSpaces = 60-strlen(gdcmDataImages[i]);
+      else
+         nbSpaces = 0;
+      for (j=0; j<nbSpaces; j++)
          std::cout << " ";    
 
       pixelType = e1->GetPixelType();
       std::cout << " pixelType="            << pixelType;
-      if (pixelType == "8U" || pixelType == "8S" )
+      if ( pixelType == "8U" || pixelType == "8S" )
          std::cout << " ";
       std::cout << " Smpl.P.Pix.="          << e1->GetSamplesPerPixel()
                 << " Plan.Config.="         << e1->GetPlanarConfiguration();
-      photomInterp =  e1->GetEntryValue(0x0028,0x0004);
-               
+ 
+      photomInterp =  e1->GetEntryValue(0x0028,0x0004);               
       std::cout << " Photom.Interp.="       << photomInterp;
-      for (unsigned int j=0; j<l-photomInterp.length(); j++)
+      for (j=0; j<l-photomInterp.length(); j++)
          std::cout << " ";
  
       std::cout << " TransferSyntaxName= [" << e1->GetTransferSyntaxName() << "]" ;
+
       swapC = e1->GetSwapCode();
-      if (swapC != 1234)
+      if ( swapC != 1234 )
           std::cout << " SwapCode = "       << e1->GetSwapCode(); 
       if ( e1->CheckIfEntryExist(0x0088,0x0200) )
           std::cout << " Icon Image Sequence";
@@ -100,7 +111,6 @@ int TestPrintAllDocument(int, char *[])
          delete e1;
          return 1;
       }
-
       delete e1;
       i++;
    }