X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FPrintHeader.cxx;h=516048e5e1c8bc7572fae9f81cf1af9da2f1636a;hb=e5e7b1bd7ee84e8f9dc7da5d1d42b598fac68399;hp=49cd54e7ba7937ed4738189eebebbda60ce38161;hpb=8fca7bc2830904113dbb5521c009775d964c5c98;p=gdcm.git

diff --git a/Example/PrintHeader.cxx b/Example/PrintHeader.cxx
index 49cd54e7..516048e5 100644
--- a/Example/PrintHeader.cxx
+++ b/Example/PrintHeader.cxx
@@ -1,60 +1,79 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: PrintHeader.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/25 10:24:33 $
+  Version:   $Revision: 1.10 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include <iostream>
 #include "gdcm.h"
 
 int main(int argc, char* argv[])
 { 
-   bool dropPriv = false;
-   bool showSeq  = true; 
    std::string fileName;   
 
-   if (argc == 1) {
-      std::cout << argv[0] <<
-      " fileName" << std::endl <<
-      "    [nopriv]  if you don't want to print Shadow groups"  << std::endl <<
-      "    [noseq]   if you don't want to 'go inside' the SQ's" << std::endl;
+   if (argc == 1)
+   {
+      std::cout << argv[0] << " fileName" << std::endl;
    }
 
-   if (argc > 1) {
+   if (argc > 1)
+   {
       fileName=argv[1];
-   } else {
+   }
+   else
+   {
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
-   
-   for (int j=0;j<argc;j++) {
-      if (strcmp(argv[j],"nopriv")==0)
-         dropPriv=true;
-      else if (strcmp(argv[j],"noseq")==0)
-         showSeq=false;
-   }
-   
-   gdcmFile *e2 = new gdcmFile(fileName.c_str(),false, showSeq, dropPriv);
-   gdcmHeader *e1 = e2->GetHeader();  
-        
-   if (argc > 2) {
+
+   gdcm::File *f1 = new gdcm::File( fileName.c_str() );
+   gdcm::Header *e1 = f1->GetHeader();  
+
+   if (argc > 2) 
+   {
       int level = atoi(argv[2]);   
       e1->SetPrintLevel(level);
    }
 
-  e1->Print();   
-      
-  std::cout << "\n\n" << std::endl;      
-  std::string transferSyntaxName = e1->GetTransfertSyntaxName();
-  std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
-   
+   e1->Print();   
+
+   std::cout << "\n\n" << std::endl; 
+
+   if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
+   {
+      std::cout << "Transfert Syntax not loaded. " << std::endl
+                << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+                << std::endl;
+      return 0;
+   }
+
+   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; 
-        e2->ParsePixelData();
-  std::cout << std::endl << "==========================================="
-                  << std::endl; 
-  }
-   
+      && 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
@@ -63,5 +82,4 @@ int main(int argc, char* argv[])
    delete e1;
 
    return 0;
-   
 }