Deal with NOSHADOWSEQ

diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index 4a14581f8d4175f4f76a65869aea7a2402b2ca98..0ad1aa94345d449c09d7737518c8f26623e00f66 100644 (file)
--- a/Example/MakeDicomDir.cxx
+++ b/Example/MakeDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: MakeDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/15 09:54:49 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/07/05 13:26:32 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -51,7 +51,8 @@ int main(int argc, char *argv[])
    " \n MakeDicomDir :\n",
    " Explores recursively the given directory, makes the relevant DICOMDIR",
    "          and writes it as 'NewDICOMDIR'",
-   " usage: MakeDicomDir dirname=rootDirectoryName [noshadow] [noseq] [debug] ",
+   " usage: MakeDicomDir dirname=rootDirectoryName [noshadowseq][noshadow][noseq] [debug] ",
+   "        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' ",
@@ -60,7 +61,7 @@ int main(int argc, char *argv[])
    // ----- Initialize Arguments Manager ------   
    gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
   
-   if (am->ArgMgrDefined("usage")) 
+   if (argc == 1 || am->ArgMgrDefined("usage")) 
    {
       am->ArgMgrUsage(usage); // Display 'usage'
       delete am;
@@ -70,15 +71,16 @@ int main(int argc, char *argv[])
    char *dirName;   
    dirName  = am->ArgMgrGetString("dirName",(char *)"."); 
 
-   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 loadMode = 0x00000000;
+   if ( am->ArgMgrDefined("noshadowseq") )
+      loadMode |= NO_SHADOWSEQ;
+   else 
+   {
+   if ( am->ArgMgrDefined("noshadow") )
+         loadMode |= NO_SHADOW;
+      if ( am->ArgMgrDefined("noseq") )
+         loadMode |= NO_SEQ;
+   }
 
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index b6fd6ce4fbaee82eb4db9f933cecce632bb8dbed..3ed667180f9909c4a857ea6eacc798250bdb847e 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/05 12:57:36 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/07/05 13:26:32 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -157,10 +157,10 @@ int main(int argc, char *argv[])
 
    int level = am->ArgMgrGetInt("level", 2);
 
+   bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
+
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
-
-   bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
  
    /* if unused Param we give up */
    if ( am->ArgMgrPrintUnusedLabels() )