X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=45b1f89cbf2e690c4b67adb782e165819f053f2f;hb=8670efa6c3fc51c51fe71c2f62af2297a19b07e2;hp=7cc42f70e5b51bff1f90015f12b11e94b9c7aac7;hpb=e5e7b1bd7ee84e8f9dc7da5d1d42b598fac68399;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 7cc42f70..45b1f89c 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/25 10:24:33 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/02/01 10:34:59 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,17 +15,21 @@
      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;
+      std::cout << " usage : PrintDocument fileName printLevel debug" 
+                << std::endl;
    }
 
    if (argc > 1) 
@@ -37,12 +41,20 @@ int main(int argc, char* argv[])
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
+
+   if (argc > 3)
+      gdcm::Debug::DebugOn();
    
-   e1= new gdcm::Header( fileName.c_str() );
-   f1 = new gdcm::File(e1);
+   e1 = new gdcm::File( fileName.c_str() );
+   f1 = new gdcm::FileHelper(e1);
+
+   if (argc > 2) 
+   {
+      int level = atoi(argv[2]);   
+      f1->SetPrintLevel(level);
+   }
 
-   e1->SetPrintLevel(2);
-   e1->Print();
+   f1->Print();   
 
    std::cout << "\n\n" << std::endl; 
 
@@ -61,43 +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 ) 
+   if ( e1->GetEntryValue(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
    {
-      std::cout << "Transfert Syntax not loaded. " << std::endl
+      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;