Fix typo

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 52d239d7f7283d8989fd900bb89f7978d30977a6..123b0fa6495213b6cb214c23a1e879bb55867f5c 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/21 05:02:11 $
-  Version:   $Revision: 1.151 $
+  Date:      $Date: 2005/08/31 16:24:19 $
+  Version:   $Revision: 1.159 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -100,7 +100,8 @@
 //
 // (Root directory Entity)     PATIENT
 // PATIENT                     STUDY
-// STUDY                       SERIES 
+// STUDY                       SERIES
+// STUDY                       VISIT 
 // SERIES                      IMAGE
 // IMAGE                       /
 //
@@ -147,8 +148,9 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    // (nothing is cheked in Document constructor, to avoid overhead)
 
    ParseDir = parseDir;
-   SetLoadMode (0x00000000); // concerns only dicom files
-   Load( fileName );
+   SetLoadMode (LD_ALL); // concerns only dicom files
+   SetFileName( fileName );
+   Load( );
 }
 #endif
 
@@ -157,9 +159,9 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
  */
 DicomDir::~DicomDir() 
 {
-   SetStartMethod(NULL);
-   SetProgressMethod(NULL);
-   SetEndMethod(NULL);
+   SetStartMethod(NULL,NULL,NULL);
+   SetProgressMethod(NULL,NULL,NULL);
+   SetEndMethod(NULL,NULL,NULL);
 
    ClearPatient();
    if ( MetaElems )
@@ -187,10 +189,10 @@ bool DicomDir::Load( )
       if ( ! this->Document::Load( ) )
          return false;
    }
-    return DoTheLoadingJob( );   
+   return DoTheLoadingJob( );   
 }
 
- #ifndef GDCM_LEGACY_REMOVE
+#ifndef GDCM_LEGACY_REMOVE
 /**
  * \brief   Loader. (DEPRECATED : kept not to break the API)
  * @param   fileName file to be open for parsing
@@ -213,6 +215,11 @@ bool DicomDir::Load(std::string const &fileName )
 }
 
 /// DEPRECATED : use SetDirectoryName(dname) instead
+/**
+ * \brief   Loader. (DEPRECATED : kept not to break the API)
+ * @param   paseDir Parse Dir
+ * @deprecated use SetDirectoryName(dname) instead
+ */
 void DicomDir::SetParseDir(bool parseDir)
 {
    ParseDir = parseDir;
@@ -402,6 +409,21 @@ void DicomDir::ParseDirectory()
    CreateDicomDir();
 }
 
+void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg )
+{
+   SetStartMethod(method,arg,NULL);
+}
+
+void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg )
+{
+   SetProgressMethod(method,arg,NULL);
+}
+
+void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg )
+{
+   SetEndMethod(method,arg,NULL);
+}
+
 /**
  * \brief   Set the start method to call when the parsing of the
  *          directory starts.
@@ -506,7 +528,7 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method )
  * @return false only when fail to open
  */
  
-bool DicomDir::WriteDicomDir(std::string const &fileName) 
+bool DicomDir::Write(std::string const &fileName) 
 {  
    int i;
    uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff };
@@ -558,7 +580,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName)
  * @return true 
  */
  
-bool DicomDir::AnonymizeDicomDir() 
+bool DicomDir::Anonymize() 
 {
    ValEntry *v;
    // Something clever to be found to forge the Patient names
@@ -619,10 +641,10 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path)
          break;
       }
 
-   f = new File( );
-   f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow
-                             //             groups, or ......
-   f->SetFileName( it->c_str() );
+      f = new File( );
+      f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow
+                              //             groups, or ......
+      f->SetFileName( it->c_str() );
    /*int res = */f->Load( );
 
 //     if ( !f )