X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=df97372165317e45e345f06b589416890bfb73dc;hb=910e35c51c25f53b00f7d1a126ae51a71474d0ab;hp=4d6a65fe6d628d588da57cfae29fc1d2d75a7e89;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 4d6a65fe..df973721 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/20 16:16:58 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/05/04 07:29:17 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,51 +15,64 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.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 *e1;
    gdcm::FileHelper   *f1;
-   std::string fileName;   
-   if (argc != 2) 
+   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 
+
+   if (argc > 3)
+      gdcm::Debug::DebugOn();
+ 
+   bool res; 
+   if (argc > 4)
+      e1->SetLoadMode(NO_SEQ | NO_SHADOW); 
+
+   // gdcm::File::IsReadable() is no usable here, because we deal with
+   // any kind of gdcm-Parsable *document* 
+   // not only gdcm::File (as opposed to gdcm::DicomDir)
+   res = e1->Load( fileName.c_str() );
+   if ( !res )
    {
-      fileName += GDCM_DATA_ROOT;
-      fileName += "/test.acr";
+      delete e1;
+      return 0;
    }
 
-   if (argc > 3)
-      gdcm::Debug::SetDebugOn();
-   
-   e1= new gdcm::Header( 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; 
 
    std::cout <<std::endl;
-   std::cout <<" dataSize " << f1->GetImageDataSize() << std::endl;
+   std::cout <<" dataSize    " << f1->GetImageDataSize()    << std::endl;
    std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
 
    int nX,nY,nZ,sPP,planarConfig;
@@ -73,12 +86,12 @@ int main(int argc, char* argv[])
    sPP          = e1->GetSamplesPerPixel();
    planarConfig = e1->GetPlanarConfiguration();
    
-   std::cout << " pixelType= ["           << pixelType 
+   std::cout << " pixelType= ["            << pixelType 
              << "] SamplesPerPixel= ["     << sPP
              << "] PlanarConfiguration= [" << planarConfig 
              << "] "<< std::endl 
              << " PhotometricInterpretation= [" 
-                                << e1->GetEntry(0x0028,0x0004)
+                                << e1->GetEntryValue(0x0028,0x0004)
              << "] "<< std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
@@ -87,7 +100,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 +118,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;