X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=604bd799b063f0fb996910de7ac983ecf087b531;hb=3d6f883e5e6149f34c22f931d199251dd2889a0b;hp=25f44cf65db2244f92d361d95d9262110af42467;hpb=9de391fb02a9a2aada30524f36816135afd98a3f;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 25f44cf6..604bd799 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/12 11:40:50 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/03/02 17:23:32 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,16 +15,16 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
-#include "gdcmDebug.h"
 #include "gdcmFile.h"
+#include "gdcmDebug.h"
+#include "gdcmFileHelper.h"
 
 #include <iostream>
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
-   gdcm::Header *e1;
-   gdcm::File   *f1;
+   gdcm::File *e1;
+   gdcm::FileHelper   *f1;
    std::string fileName;   
    if (argc != 2) 
    {
@@ -42,19 +42,20 @@ int main(int argc, char* argv[])
       fileName += "/test.acr";
    }
 
+
    if (argc > 3)
-      gdcm::Debug::SetDebugOn();
+      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]);   
-      e1->SetPrintLevel(level);
+      f1->SetPrintLevel(level);
    }
 
-   e1->Print();   
+   f1->Print();   
 
    std::cout << "\n\n" << std::endl; 
 
@@ -73,21 +74,21 @@ int main(int argc, char* argv[])
    sPP          = e1->GetSamplesPerPixel();
    planarConfig = e1->GetPlanarConfiguration();
    
-   std::cout << " pixelType="           << pixelType 
-             << " SamplesPerPixel="     << sPP
-             << " PlanarConfiguration=" << planarConfig 
-             << std::endl 
-             << " PhotometricInterpretation=" 
-                                << e1->GetEntry(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->GetEntry(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
+   if ( e1->GetEntryValue(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
    {
       std::cout << "Transfer Syntax not loaded. " << std::endl
                 << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
@@ -105,6 +106,7 @@ int main(int argc, char* argv[])
       std::cout <<std::endl<<fileName<<" is NOT Readable"<<std::endl;
    std::cout<<std::flush;
    delete e1;
+   delete f1;
 
    return 0;