X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=6135c783aa29c9efe929b31f5c9c012aee98e439;hb=1e8074191600434684069ea9fad2931507fcdb2f;hp=cafceb7067522b6b57a7f297608a1bea9f43c8e7;hpb=0986478262825c77c4080e9eee13020622636e3d;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index cafceb70..6135c783 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/19 15:26:42 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/04/05 10:28:59 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,46 +15,50 @@
      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;
-   std::string fileName;   
-   if (argc != 2) 
+   gdcm::File *e1;
+   gdcm::FileHelper   *f1;
+   std::string fileName;
+  
+   if (argc == 1) 
    {
-      std::cout << " usage : PrintDocument fileName printLevel debug" 
+      std::cout << " usage : PrintFile fileName printLevel debug "
+          << "short (=NOSEQ + NOSHADOW)" 
                 << std::endl;
+    return 0;
    }
 
+   e1 = new gdcm::File();
+
    if (argc > 1) 
    {
       fileName=argv[1];
    } 
-   else 
-   {
-      fileName += GDCM_DATA_ROOT;
-      fileName += "/test.acr";
-   }
 
    if (argc > 3)
-      gdcm::Debug::SetDebugOn();
+      gdcm::Debug::DebugOn();
+
+   if (argc > 4)
+      e1->SetLoadMode(NO_SEQ | NO_SHADOW);
    
-   e1= new gdcm::Header( fileName.c_str() );
-   f1 = new gdcm::File(e1);
+   e1->Load( fileName.c_str() );
+
+   f1 = new gdcm::FileHelper(e1);
 
-   if (argc > 2) 
+   if (argc > 2)  // keep it here (f1 needs to be constructed !)
    {
       int level = atoi(argv[2]);   
-      e1->SetPrintLevel(level);
+      f1->SetPrintLevel(level);
    }
 
-   e1->Print();   
+   f1->Print();   
 
    std::cout << "\n\n" << std::endl; 
 
@@ -78,7 +82,7 @@ int main(int argc, char* argv[])
              << "] PlanarConfiguration= [" << planarConfig 
              << "] "<< std::endl 
              << " PhotometricInterpretation= [" 
-                                << e1->GetEntry(0x0028,0x0004)
+                                << e1->GetEntryValue(0x0028,0x0004)
              << "] "<< std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
@@ -87,7 +91,7 @@ int main(int argc, char* argv[])
              << 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 +109,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;