According to Benoit's suggestion, and without any objection from anybody

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 7cc42f70e5b51bff1f90015f12b11e94b9c7aac7..f36257e61659071e1bc3b8701af45daf903f936b 100644 (file)
--- 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/01/08 15:03:57 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
+#include "gdcmHeader.h"
+#include "gdcmFile.h"
+
 #include <iostream>
-#include "gdcm.h"
 
 int main(int argc, char* argv[])
 {
@@ -41,8 +43,8 @@ int main(int argc, char* argv[])
    e1= new gdcm::Header( fileName.c_str() );
    f1 = new gdcm::File(e1);
 
-   e1->SetPrintLevel(2);
-   e1->Print();
+   f1->SetPrintLevel(2);
+   f1->Print();
 
    std::cout << "\n\n" << std::endl; 
 
@@ -66,7 +68,7 @@ int main(int argc, char* argv[])
              << " PlanarConfiguration=" << planarConfig 
              << std::endl 
              << " PhotometricInterpretation=" 
-                                << e1->GetEntryByNumber(0x0028,0x0004)
+                                << e1->GetEntry(0x0028,0x0004)
              << std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
@@ -75,7 +77,7 @@ int main(int argc, char* argv[])
              << std::endl;
 
   
-   if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
+   if ( e1->GetEntry(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
    {
       std::cout << "Transfert Syntax not loaded. " << std::endl
                 << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
@@ -86,19 +88,6 @@ int main(int argc, char* argv[])
    std::string transferSyntaxName = e1->GetTransfertSyntaxName();
    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; 
-   }
-   
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
    else