X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=ef69a0b4f055cf95b41cfa783cf9fecf2e573b91;hb=060c223316b9f66ff6d088922ba0872a7f772292;hp=50ea2bb9c5354eac47ea157f8f54ce29ef425cc1;hpb=ac113b082275780715dbd1605b2d7c873481eb9a;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 50ea2bb9..ef69a0b4 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/28 17:02:34 $
-  Version:   $Revision: 1.47 $
+  Date:      $Date: 2005/09/04 15:43:12 $
+  Version:   $Revision: 1.53 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,6 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.h"
+#include "gdcmDocument.h"
 #include "gdcmSeqEntry.h"
 #include "gdcmSQItem.h"
 #include "gdcmBinEntry.h"
@@ -23,7 +24,8 @@
 #include "gdcmFileHelper.h"
 #include "gdcmDebug.h"
 #include "gdcmDirList.h"
-
+#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
 #include "gdcmArgMgr.h"
 
 #include <iostream>
@@ -121,16 +123,21 @@ int main(int argc, char *argv[])
 {
 
    START_USAGE(usage)
-   " \n PrintFile : \n                                                       ",
-   " Display the header of a ACR-NEMA/PAPYRUS/DICOM File                     ",
-   " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]", 
+   " \n PrintFile : \n                                                        ",
+   " 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",
-   "        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)",
+   "      level = 0,1,2 : depending on the amount of details user wants to see",
+   "      listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)",
+   "                                of Elements to load whatever their length ",
+   "      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   
@@ -161,21 +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 forceLoadNb;
+   uint16_t *elemsToForceLoad 
+                           = 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() )
    {
@@ -188,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
@@ -197,8 +222,14 @@ int main(int argc, char *argv[])
       gdcm::File *f = new gdcm::File();
       f->SetLoadMode(loadMode);
       f->SetFileName( fileName );
-      bool res = f->Load();
 
+      for (int ri=0; ri<forceLoadNb; ri++)
+      {
+         f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
+                                (uint32_t)elemsToForceLoad[2*ri+1] ); 
+      }
+
+      bool res = f->Load();
       if ( !res )
       {
          std::cout << "Cannot process file [" << fileName << "]" << std::endl;
@@ -363,6 +394,13 @@ int main(int argc, char *argv[])
          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]);
+            f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
+                                   (uint32_t)elemsToForceLoad[2*ri+1]); 
+         }
          res = f->Load();
 
          if ( !res )