X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FPrintFile.cxx;h=0bf9ff33a7253a1d58f7ccc3fc7042b5f13e1a98;hb=6dc9a6a8aee263acf3dd2ce1d7f32c51b9133cc0;hp=4d6a65fe6d628d588da57cfae29fc1d2d75a7e89;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 4d6a65fe..0bf9ff33 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/06/07 11:12:10 $
+  Version:   $Revision: 1.38 $
                                                                                 
   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,86 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
-#include "gdcmDebug.h"
+#include "gdcmFile.h"
 #include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
+
+#include "gdcmArgMgr.h"
 
 #include <iostream>
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
-   gdcm::Header *e1;
-   gdcm::FileHelper   *f1;
-   std::string fileName;   
-   if (argc != 2) 
+
+   START_USAGE(usage)
+   " \n PrintFile : \n",
+   " Display the header of a ACR-NEMA/PAPYRUS/DICOM File",
+   " usage: PrintFile filein=fileName [level=n] [noshadow] [noseq] [debug] ",
+   "        level = 0,1,2 : depending on the amount of details user wants to see",
+   "        noshadow : user doesn't want to load Private groups (odd number)",
+   "        noseq    : user doesn't want to load Sequences ",
+   "        debug    : user wants to run the program in 'debug mode' ",
+   FINISH_USAGE
+
+   // Initialize Arguments Manager   
+   gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv);
+  
+   if (argc == 1)
    {
-      std::cout << " usage : PrintDocument fileName printLevel debug" 
-                << std::endl;
+      am->ArgMgrUsage(usage); // Display 'usage'
+      delete am;
+      return 0;
    }
 
-   if (argc > 1) 
-   {
-      fileName=argv[1];
+   char *fileName = am->ArgMgrWantString("filein",usage);
+
+   int loadMode;
+   if ( am->ArgMgrDefined("noshadow") && am->ArgMgrDefined("noseq") )
+       loadMode = NO_SEQ | NO_SHADOW;  
+   else if ( am->ArgMgrDefined("noshadow") )
+      loadMode = NO_SHADOW;
+   else if ( am->ArgMgrDefined("noseq") )
+      loadMode = NO_SEQ;
+   else
+      loadMode = 0;
+
+   int level = am->ArgMgrGetInt("level", 2);
+
+   if (am->ArgMgrDefined("debug"))
+      gdcm::Debug::DebugOn();
+
+   /* if unused Param we give up */
+   if ( am->ArgMgrPrintUnusedLabels() )
+   { 
+      am->ArgMgrUsage(usage);
+      delete am;
+      return 0;
    } 
-   else 
-   {
-      fileName += GDCM_DATA_ROOT;
-      fileName += "/test.acr";
-   }
+ 
+   // 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)
 
-   if (argc > 3)
-      gdcm::Debug::SetDebugOn();
-   
-   e1= new gdcm::Header( fileName.c_str() );
-   f1 = new gdcm::FileHelper(e1);
+   gdcm::File *e1 = new gdcm::File();
+   e1->SetLoadMode(loadMode);
 
-   if (argc > 2) 
+   bool res = e1->Load( fileName );
+   if ( !res )
    {
-      int level = atoi(argv[2]);   
-      e1->SetPrintLevel(level);
+      delete e1;
+      delete am;
+      return 0;
    }
 
-   e1->Print();   
+   gdcm::FileHelper *f1 = new gdcm::FileHelper(e1);
+   f1->SetPrintLevel( level );
+
+   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 +108,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 +122,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,7 +140,8 @@ int main(int argc, char* argv[])
       std::cout <<std::endl<<fileName<<" is NOT Readable"<<std::endl;
    std::cout<<std::flush;
    delete e1;
-
+   delete f1;
+   delete am;
    return 0;
    
 }