X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FMakeDicomDir.cxx;h=9f87f5dfaab071a577579a93b0e10ba8fe89b237;hb=ac2e8ecc8319069451f1fe5a4413915d56f9cbdc;hp=72ff4ffa541ad43f61250daac6620f9a5c8295e9;hpb=94d13393e488310ea378c26380566596ef208bfd;p=gdcm.git

diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index 72ff4ffa..9f87f5df 100644
--- 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/07 11:12:10 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/07/21 04:55:50 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,6 @@ void EndMethod(void *toto) {
 // ---
 
 /**
-  * \ingroup Test
   * \brief   Explores recursively the given directory
   *          orders the gdcm-readable found Files
   *          according their Patient/Study/Serie/Image characteristics
@@ -49,19 +48,23 @@ void EndMethod(void *toto) {
 int main(int argc, char *argv[]) 
 {
    START_USAGE(usage)
-   " \n MakeDicomDir :\n",
-   " Explores recursively the given directory, makes the relevant DICOMDIR",
-   "          and writes it as 'NewDICOMDIR'",
-   " usage: MakeDicomDir dirname=rootDirectoryName [noshadow] [noseq] [debug] ",
-   "        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' ",
+   " \n MakeDicomDir :\n                                                      ",
+   " Explores recursively the given directory, makes the relevant DICOMDIR    ",
+   "          and writes it as 'NewDICOMDIR'                                  ",
+   "                                                                          ", 
+   " 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'          ",
    FINISH_USAGE
 
    // ----- 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;
@@ -69,17 +72,18 @@ int main(int argc, char *argv[])
    }
 
    char *dirName;   
-   dirName  = am->ArgMgrGetString("dirName","."); 
-
-   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;
+   dirName  = am->ArgMgrGetString("dirName",(char *)"."); 
+
+   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();
@@ -101,13 +105,14 @@ int main(int argc, char *argv[])
    // we ask for Directory parsing
 
    dcmdir = new gdcm::DicomDir( );
-   dcmdir->SetParseDir(true);
 
    dcmdir->SetStartMethod(StartMethod, (void *) NULL);
    dcmdir->SetEndMethod(EndMethod);
 
    dcmdir->SetLoadMode(loadMode);
-   dcmdir->Load(dirName);
+   dcmdir->SetDirectoryName(dirName);
+   //dcmdir->SetParseDir(true);
+   dcmdir->Load();
 
     // ----- Check the result