X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestPrintAllDocument.cxx;h=7325f9c35e98384dab432e5eff23674f82875875;hb=7a6f4850521b56e6b907cb8c7938471898613fa4;hp=e9be24cc94289fd1ce70159740c04409e83f70a5;hpb=b19adc9e0168b80e420811c89a93dc114493033c;p=gdcm.git

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index e9be24cc..7325f9c3 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/02/02 10:41:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/07/21 04:51:26 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,36 +33,62 @@
 #include "gdcmSQItem.h" 
 #include "gdcmValEntry.h" 
 
+#include <fstream>
 #include <iostream>
+#include <iomanip> // for std::ios::left, ...
 
 //Generated file:
 #include "gdcmDataImages.h"
 
 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 ");
    while( gdcmDataImages[i] != 0 )
    {
       std::string filename = GDCM_DATA_ROOT;
       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
+ 
+      //s.setf(std::ios::left);
+      //s << std::setw(60-filename.length()) << " ";
+      //std::cout << s.str() << gdcmDataImages[i];
+
+      std::cout << gdcmDataImages[i];
+      for (j=0; j<60-strlen(gdcmDataImages[i]); j++)
+         std::cout << " ";    
 
-      // just to be able to grep the display result, for some usefull info     
-      std::cout << filename
-                << " TransferSyntaxName= [" << e1->GetTransferSyntaxName() 
-                << "] SwapCode = "          << e1->GetSwapCode() 
-                << " PhotometricInterpretation=" 
-                                            << e1->GetEntryValue(0x0028,0x0004)
-                << " pixelType="            << e1->GetPixelType() 
-                << " SamplesPerPixel="      << e1->GetSamplesPerPixel()
-                << " PlanarConfiguration="  << e1->GetPlanarConfiguration();
+      pixelType = e1->GetPixelType();
+      std::cout << " pixelType="            << pixelType;
+      if ( pixelType == "8U" || pixelType == "8S" )
+         std::cout << " ";
+      std::cout << " Smpl.P.Pix.="          << e1->GetSamplesPerPixel()
+                << " Plan.Config.="         << e1->GetPlanarConfiguration();
+      photomInterp =  e1->GetEntryValue(0x0028,0x0004);
+               
+      std::cout << " Photom.Interp.="       << photomInterp;
+      for (j=0; j<l-photomInterp.length(); j++)
+         std::cout << " ";
+ 
+      std::cout << " TransferSyntaxName= [" << e1->GetTransferSyntaxName() << "]" ;
+      swapC = e1->GetSwapCode();
+      if ( swapC != 1234 )
+          std::cout << " SwapCode = "       << e1->GetSwapCode(); 
       if ( e1->CheckIfEntryExist(0x0088,0x0200) )
-           std::cout << " Icon Image Sequence";
+          std::cout << " Icon Image Sequence";
 
        std::cout << std::endl;