X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=c7e882c6be2460e344f17e710b9540a3c2d4316b;hb=1dd2c40c0da9098b444ad53b0e3c23da808997fa;hp=9e41e49cc98b4d0ed9dda85239ab6817acf7bbe1;hpb=c42ce41966ee7a572752d7f45ddff25b90515119;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 9e41e49c..c7e882c6 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 10:23:46 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/01/24 16:10:49 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,38 +15,53 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
+#include "gdcmFile.h"
+#include "gdcmDebug.h"
+#include "gdcmFileHelper.h"
+
 #include <iostream>
-#include "gdcm.h"
 
 int main(int argc, char* argv[])
 {
- 
-   gdcm::Header *e1;
-   gdcm::File   *f1;
+   gdcm::File *e1;
+   gdcm::FileHelper   *f1;
    std::string fileName;   
-   if (argc != 2) {
-      std::cout << " usage : PrintDocument fileName" << std::endl;
+   if (argc != 2) 
+   {
+      std::cout << " usage : PrintDocument fileName printLevel debug" 
+                << std::endl;
    }
 
-   if (argc > 1) {
+   if (argc > 1) 
+   {
       fileName=argv[1];
-   } else {
+   } 
+   else 
+   {
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
+
+   if (argc > 3)
+      gdcm::Debug::SetDebugOn();
    
-   e1= new gdcm::Header( fileName.c_str() );
+   e1 = new gdcm::File( fileName.c_str() );
+   f1 = new gdcm::FileHelper(e1);
 
-   f1 = new gdcm::File(e1);
+   if (argc > 2) 
+   {
+      int level = atoi(argv[2]);   
+      f1->SetPrintLevel(level);
+   }
+
+   f1->Print();   
 
-   e1->SetPrintLevel(2);
-   
-   e1->Print();
-      
    std::cout << "\n\n" << std::endl; 
 
-   int dataSize = f1->GetImageDataSize();
-   std::cout <<std::endl <<" dataSize " << dataSize << std::endl;
+   std::cout <<std::endl;
+   std::cout <<" dataSize " << f1->GetImageDataSize() << std::endl;
+   std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
+
    int nX,nY,nZ,sPP,planarConfig;
    std::string pixelType;
    nX=e1->GetXSize();
@@ -58,42 +73,31 @@ int main(int argc, char* argv[])
    sPP          = e1->GetSamplesPerPixel();
    planarConfig = e1->GetPlanarConfiguration();
    
-   std::cout << " pixelType="           << pixelType 
-             << " SamplesPerPixel="     << sPP
-             << " PlanarConfiguration=" << planarConfig 
-             << std::endl 
-             << " PhotometricInterpretation=" 
-                                << e1->GetEntryByNumber(0x0028,0x0004)
-             << std::endl;
+   std::cout << " pixelType= ["           << pixelType 
+             << "] SamplesPerPixel= ["     << sPP
+             << "] PlanarConfiguration= [" << planarConfig 
+             << "] "<< std::endl 
+             << " PhotometricInterpretation= [" 
+                                << e1->GetEntryValue(0x0028,0x0004)
+             << "] "<< std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
-   std::cout << " NumberOfScalarComponents " << numberOfScalarComponents <<std::endl
-             << " LUT=" << (e1->HasLUT() ? "TRUE" : "FALSE")
+   std::cout << " NumberOfScalarComponents = " << numberOfScalarComponents <<std::endl
+             << " LUT = " << (e1->HasLUT() ? "TRUE" : "FALSE")
              << std::endl;
 
   
-  if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) {
-     std::cout << "Transfert Syntax not loaded. " << std::endl
-               << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
-               << std::endl;
+   if ( e1->GetEntryValue(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
+   {
+      std::cout << "Transfer Syntax not loaded. " << std::endl
+                << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+                << std::endl;
       return 0;
-  }
+   }
   
-   std::string transferSyntaxName = e1->GetTransfertSyntaxName();
+   std::string transferSyntaxName = e1->GetTransferSyntaxName();
    std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
-   
-   if (  transferSyntaxName != "Implicit VR - Little Endian"
-      && transferSyntaxName != "Explicit VR - Little Endian"     
-      && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
-      && transferSyntaxName != "Explicit VR - Big Endian"
-      && transferSyntaxName != "Uncompressed ACR-NEMA"     )
-  {
-      std::cout << std::endl << "==========================================="
-                  << std::endl; 
-         f1->GetPixelConverter()->Print();
-      std::cout << std::endl << "==========================================="
-                  << std::endl; 
-   }      
+   std::cout << " SwapCode= " << e1->GetSwapCode() << std::endl;
    
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;