X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FMakeDicomDir.cxx;h=86f7ec752127633f5b62972a5bdf55edd36e1b00;hb=a5aacc396d46724edd3836af98e87f54415398b0;hp=9f9ac06b58da7e0deef42d9ae36af37d731b4a70;hpb=bbfa3cf89fc2ede7c43259e945f021044b56069f;p=gdcm.git

diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index 9f9ac06b..86f7ec75 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/02/02 14:26:30 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/11/28 17:09:22 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,24 +19,13 @@
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDirList.h"
+#include "gdcmDebug.h"
+#include "gdcmArgMgr.h"
 
 #include <iostream>
 
-// ---
-void StartMethod(void *toto) {
-  (void)toto;
-   std::cout<<"Start parsing"<<std::endl;
-}
-
-void EndMethod(void *toto) {
-  (void)toto;
-   std::cout<<"End parsing"<<std::endl;
-}
-// ---
-
 /**
-  * \ingroup Test
-  * \brief   Explores recursively the given directory (or GDCM_DATA_ROOT by default)
+  * \brief   Explores recursively the given directory
   *          orders the gdcm-readable found Files
   *          according their Patient/Study/Serie/Image characteristics
   *          makes the gdcmDicomDir 
@@ -45,29 +34,111 @@ 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                            ",
+   "        [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 (argc == 1 || am->ArgMgrDefined("usage")) 
+   {
+      am->ArgMgrUsage(usage); // Display 'usage'
+      delete am;
+      return 0;
+   }
+
+   char *dirName;   
+   dirName  = am->ArgMgrGetString("dirName",(char *)"."); 
+
+   int loadMode = gdcm::LD_ALL;
+   if ( am->ArgMgrDefined("noshadowseq") )
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
+   else 
+   {
+   if ( am->ArgMgrDefined("noshadow") )
+         loadMode |= gdcm::LD_NOSHADOW;
+      if ( am->ArgMgrDefined("noseq") )
+         loadMode |= gdcm::LD_NOSEQ;
+   }
+
+   if (am->ArgMgrDefined("debug"))
+      gdcm::Debug::DebugOn();
+ 
+   // if unused Param we give up
+   if ( am->ArgMgrPrintUnusedLabels() )
+   { 
+      am->ArgMgrUsage(usage);
+      delete am;
+      return 0;
+   }
+
+   delete am;  // we don't need Argument Manager any longer
+
+   // ----- Begin Processing -----
+
    gdcm::DicomDir *dcmdir;
-   std::string dirName;   
 
-   if (argc > 1)
-      dirName = argv[1];
-   else
-      dirName = GDCM_DATA_ROOT;
+   // we ask for Directory parsing
+
+   dcmdir = gdcm::DicomDir::New( );
 
-   dcmdir = new gdcm::DicomDir(dirName, true); // we ask for Directory parsing
+   dcmdir->SetLoadMode(loadMode);
+   dcmdir->SetDirectoryName(dirName);
+   //dcmdir->SetParseDir(true);
+   dcmdir->Load();
 
-   dcmdir->SetStartMethod(StartMethod, (void *) NULL);
-   dcmdir->SetEndMethod(EndMethod);
-   
-   if ( !dcmdir->GetFirstEntry() ) 
+    // ----- Check the result
+    
+   if ( !dcmdir->GetFirstPatient() ) 
    {
-      std::cout << "makeDicomDir: no patient list present. Exiting."
+      std::cout << "makeDicomDir: no patient found. Exiting."
                 << std::endl;
+      dcmdir->Delete();
       return 1;
    }
     
-   dcmdir->WriteDicomDir("NewDICOMDIR");
+   // ----- Create the corresponding DicomDir
+
+   dcmdir->Write("NewDICOMDIR");
+   dcmdir->Delete();
+
+   // Read from disc the just written DicomDir
+   gdcm::DicomDir *newDicomDir = gdcm::DicomDir::New();
+   newDicomDir->SetFileName( "NewDICOMDIR" );
+   newDicomDir->Load();
+   if( !newDicomDir->IsReadable() )
+   {
+      std::cout<<"          Written DicomDir 'NewDICOMDIR'"
+               <<" is not readable"<<std::endl
+               <<"          ...Failed"<<std::endl;
+
+      newDicomDir->Delete();
+      return 1;
+   }
+
+   if( !newDicomDir->GetFirstPatient() )
+   {
+      std::cout<<"          Written DicomDir 'NewDICOMDIR'"
+               <<" has no patient"<<std::endl
+               <<"          ...Failed"<<std::endl;
+
+      newDicomDir->Delete();
+      return(1);
+   }
+
    std::cout<<std::flush;
 
-   delete dcmdir;
+   newDicomDir->Delete();
    return 0;
 }