X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=156c7add619b56064bacbe15a56451b9e3ae1165;hb=7456fe5d01a4cdcf3227ef46aa1b75a8ff970416;hp=1801f17e80e4294c0f5e0a4e8a76727742496263;hpb=9ca888585c371145bae465d9f5d0cc6c7a95b3b5;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 1801f17e..156c7add 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/08/29 12:25:37 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/09/06 11:10:03 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,8 @@
 #include "gdcmFileHelper.h"
 #include "gdcmDebug.h"
 #include "gdcmDirList.h"
-
+#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
 #include "gdcmArgMgr.h"
 
 #include <iostream>
@@ -126,15 +127,17 @@ int main(int argc, char *argv[])
    " Display the header of a ACR-NEMA/PAPYRUS/DICOM File                      ",
    " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]",
    "                       [forceload=listOfElementsToForceLoad]              ",
+   "                       [dict= privateDirectory]                           ",
    "                       [ { [noshadowseq] | [noshadow][noseq] } ] [debug]  ",
    "      level = 0,1,2 : depending on the amount of details user wants to see",
-   "      listOfElementsToForceLOad : group-elem,g2-e2,... (in hexa, no space)",
+   "      listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)",
    "                                of Elements to load whatever their length ",
-   "        noshadowseq: user doesn't want to load Private Sequences          ",
-   "        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'        ",
-   "        showlut :user wants to display the Palette Color (as an int array)",
+   "      privateDirectory : source file full path name of Shadow Group elems ",
+   "      noshadowseq: user doesn't want to load Private Sequences            ",
+   "      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'          ",
+   "      showlut :user wants to display the Palette Color (as an int array)  ",
    FINISH_USAGE
 
    // Initialize Arguments Manager   
@@ -165,25 +168,33 @@ int main(int argc, char *argv[])
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
  
-   int loadMode = 0x00000000;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= NO_SHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= NO_SHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= NO_SEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
-   int level = am->ArgMgrGetInt("level", 2);
+   int level = am->ArgMgrGetInt("level", 1);
 
    int forceLoadNb;
    uint16_t *elemsToForceLoad 
-                        = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb);
+                           = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb);
 
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
+   bool ddict = am->ArgMgrDefined("dict") ? true : false;
+   char *dict = 0;
+
+   if (ddict)
+   {
+     dict = am->ArgMgrGetString("dict",(char *)0);
+   }
+
    /* if unused Param we give up */
    if ( am->ArgMgrPrintUnusedLabels() )
    {
@@ -196,6 +207,12 @@ int main(int argc, char *argv[])
 
    // ----------- End Arguments Manager ---------
 
+
+   if (ddict)
+   {
+      gdcm::Global::GetDicts()->GetDefaultPubDict()->AddDict(dict);   
+   }
+
    if ( fileName != 0 ) // ====== Deal with a single file ======
    { 
       // gdcm::File::IsReadable() is no usable here, because we deal with
@@ -213,7 +230,6 @@ int main(int argc, char *argv[])
       }
 
       bool res = f->Load();
-
       if ( !res )
       {
          std::cout << "Cannot process file [" << fileName << "]" << std::endl;
@@ -243,7 +259,8 @@ int main(int argc, char *argv[])
       nX=f->GetXSize();
       nY=f->GetYSize();
       nZ=f->GetZSize();
-      std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ << std::endl;
+      std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ 
+                << std::endl;
 
       pixelType    = f->GetPixelType();
       sPP          = f->GetSamplesPerPixel();
@@ -354,11 +371,30 @@ int main(int argc, char *argv[])
          std::cout << "Try LUT Data "<< std::endl;
          ShowLutData(f);
       }
+
+      if( !f->gdcm::Document::IsReadable())
+     {
+         std::cout <<std::endl<<fileName<<" is NOT 'gdcm parsable'"<<std::endl;
+      }
      
       if (f->IsReadable())
          std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
-      else
-         std::cout <<std::endl<<fileName<<" is NOT Readable"<<std::endl;
+      else if ( f->GetSeqEntry(0x0041,0x1010) )
+      {
+         std::cout <<std::endl<<fileName<<" looks like a 'PAPYRUS image' file"
+                   <<std::endl;
+      }
+      else if ( f->GetSeqEntry(0x0004,0x1220) )
+      {
+         std::cout <<std::endl<<fileName<<" looks like a 'DICOMDIR file'"
+                   <<std::endl;
+      }
+      else 
+      {
+         std::cout <<std::endl<<fileName<<" doesn't look like an image file "
+             <<std::endl; 
+      }
+ 
       std::cout<<std::flush;
       delete f;
       delete fh;
@@ -375,13 +411,16 @@ int main(int argc, char *argv[])
                                  it != fileList.end();
                                  ++it )
       {
+         std::cout << std::endl<<" Start processing :[" << it->c_str() << "]"
+                   << std::endl;
          f = new gdcm::File();
          f->SetLoadMode(loadMode);
          f->SetFileName( it->c_str() );
 
          for (int ri=0; ri<forceLoadNb; ri++)
          {
-            printf("%04x,%04x\n",elemsToForceLoad[2*ri], elemsToForceLoad[2*ri+1]);
+            printf("%04x,%04x\n",elemsToForceLoad[2*ri], 
+                                 elemsToForceLoad[2*ri+1]);
             f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
                                    (uint32_t)elemsToForceLoad[2*ri+1]); 
          }
@@ -395,8 +434,9 @@ int main(int argc, char *argv[])
                       << std::endl;
             std::cout << "or it's not a Dicom File, or its 'header' is bugged" 
                       << std::endl;
-            std::cout << "use 'PrintFile filein=... debug' to try to guess the pb"
-                   << std::endl;
+            std::cout << "use 'PrintFile filein=... debug' "
+                      << "to try to guess the pb"
+                      << std::endl;
             delete f;
             continue;
          }