X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDocument.cxx;h=8e9bba04adde9affc5a4384ed2d168bc87250c6d;hb=933fb20f37f5f900c53c59b2a739e18303bd60d8;hp=d03149662bdbe23372b1b224e0f5e9ac9611a568;hpb=16887ff26b068405a235a6a8a37f4e62516de393;p=gdcm.git

diff --git a/Example/PrintDocument.cxx b/Example/PrintDocument.cxx
index d0314966..8e9bba04 100644
--- a/Example/PrintDocument.cxx
+++ b/Example/PrintDocument.cxx
@@ -1,39 +1,18 @@
 #include <iostream>
-
-#include "gdcmException.h"
-#include "gdcmCommon.h"
-
-#include "gdcmDictEntry.h"
-#include "gdcmDict.h"
-#include "gdcmDictSet.h"
-#include "gdcmHeader.h"
-#include "gdcmUtil.h"
-#include "gdcmBinEntry.h"  
-#include "gdcmDocEntry.h" 
-#include "gdcmDocEntrySet.h"           
-#include "gdcmDocument.h"          
-#include "gdcmElementSet.h"        
-#include "gdcmSeqEntry.h" 
-#include "gdcmSQItem.h" 
-#include "gdcmValEntry.h" 
+#include "gdcm.h"
 
 int main(int argc, char* argv[])
 {
  
-//   gdcmFile *e2;
-   gdcmHeader *e1;
-   bool dropPriv = false;
-   bool showSeq  = true; 
-   bool niou     = false;  
+   gdcm::Header *e1;
    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 <<
-      "    [new]     if you want a 'SeQuence indented' printing"<< std::endl;
-   }	
+   if (argc != 2) {
+      std::cout << " Usage : "
+                << argv[0] 
+                << " filename."
+                << std::endl;
+   }
 
    if (argc > 1) {
       fileName=argv[1];
@@ -42,55 +21,13 @@ int main(int argc, char* argv[])
       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;
-      else if (strcmp(argv[j],"new")==0)
-         niou = true;	 
-   }
-   
-   //e2 = new gdcmFile(fileName.c_str(),false, showSeq, dropPriv);
-   //e1 = e2->GetHeader();
-    
-   e1= new gdcmHeader 
-   	(fileName.c_str(),
-	false, showSeq,
-	dropPriv);
-	
-//   if (argc > 2) {
-//      int level = atoi(argv[2]);   
-//      e1->SetPrintLevel(level);
-//   }
-
-e1->SetPrintLevel(2);
+   e1= new gdcm::Header( fileName.c_str() );
 
-   //if (! niou) 
-   //   e1->Print();   
-   //else if (showSeq)
-   //   e1->PrintNiceSQ();
-   //else
-   //   e1->PrintNoSQ();
+   e1->SetPrintLevel(2);
    
-  e1->Print();
+   e1->Print();
       
-  std::cout << "\n\n" << std::endl;      
-  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; 
-   }	      
+   std::cout << "\n\n" << std::endl;        
    
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;