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

diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index a479143a..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/06/14 09:08:46 $
-  Version:   $Revision: 1.5 $
+  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
@@ -20,25 +20,11 @@
 #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
   *          orders the gdcm-readable found Files
   *          according their Patient/Study/Serie/Image characteristics
@@ -49,19 +35,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;
@@ -71,15 +61,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 = 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();
@@ -100,14 +91,12 @@ 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 = gdcm::DicomDir::New( );
 
    dcmdir->SetLoadMode(loadMode);
-   dcmdir->Load(dirName);
+   dcmdir->SetDirectoryName(dirName);
+   //dcmdir->SetParseDir(true);
+   dcmdir->Load();
 
     // ----- Check the result
     
@@ -115,24 +104,26 @@ int main(int argc, char *argv[])
    {
       std::cout << "makeDicomDir: no patient found. Exiting."
                 << std::endl;
-      delete dcmdir;
+      dcmdir->Delete();
       return 1;
    }
     
    // ----- Create the corresponding DicomDir
 
-   dcmdir->WriteDicomDir("NewDICOMDIR");
-   delete dcmdir;
+   dcmdir->Write("NewDICOMDIR");
+   dcmdir->Delete();
 
    // Read from disc the just written DicomDir
-   gdcm::DicomDir *newDicomDir = new gdcm::DicomDir("NewDICOMDIR");
+   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;
 
-      delete newDicomDir;
+      newDicomDir->Delete();
       return 1;
    }
 
@@ -142,12 +133,12 @@ int main(int argc, char *argv[])
                <<" has no patient"<<std::endl
                <<"          ...Failed"<<std::endl;
 
-      delete newDicomDir;
+      newDicomDir->Delete();
       return(1);
    }
 
    std::cout<<std::flush;
 
-   delete newDicomDir;
+   newDicomDir->Delete();
    return 0;
 }