X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=64b61a3a51eb3098d6f6f8ee4174f162f1307d99;hb=a770affb0ae95b1a1c0647ce7ee84f179e6714da;hp=a7d6893daea6d031b6ad40d123d9c2756319c27a;hpb=6003c9cbddd74caa0f6a7de58d5f1e3f8a4c38c4;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index a7d6893d..64b61a3a 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:31:09 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2005/07/08 10:13:38 $
+  Version:   $Revision: 1.62 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,22 +49,36 @@ typedef std::vector<Document *>  VectDocument;
 class GDCM_EXPORT DicomDir: public Document
 {
 public:
-   typedef void(Method)(void*);
+   typedef void Method(void*);
 
    DicomDir( std::string const &filename, bool parseDir = false );
    DicomDir(); 
                    
    ~DicomDir();
 
+   bool Load( std::string const &filename );
+   bool Load( );
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
-
+   
+   /// Sets the root Directory name to parse, recursively
+   void SetDirectoryName(std::string const &dirName) 
+        { ParseDir = true; if (Filename != dirName)
+                               Filename = dirName, IsDocumentModified = true; };
+   /// Accessor to \ref Filename
+   virtual void SetFileName(std::string const &fileName) 
+                   { ParseDir = false; if (Filename != fileName)
+                               Filename = fileName, IsDocumentModified = true; }
+
+   /// DEPRECATED : use SetDirectoryName
+   void SetParseDir(bool parseDir)  { ParseDir = parseDir; };
+   
    // Informations contained in the parser
    virtual bool IsReadable();
 
    // Meta
-   DicomDirMeta    *NewMeta();
+   DicomDirMeta *NewMeta();
    /// Returns a pointer to the DicomDirMeta for this DICOMDIR. 
-   DicomDirMeta* GetMeta() { return MetaElems; };
+   DicomDirMeta *GetMeta() { return MetaElems; };
 
    // Patients
    DicomDirPatient *NewPatient();
@@ -78,7 +92,7 @@ public:
 
    // Note: the DicomDir:: namespace prefix is needed by Swig in the 
    //       following method declarations. Refer to gdcmPython/gdcm.i
-   //       for the reasons of this unecessary notation at C++ level.
+   //       for the reasons of this unnecessary notation at C++ level.
    void SetStartMethod(    DicomDir::Method *method,
                            void *arg = NULL,
                            DicomDir::Method *argDelete = NULL );
@@ -88,9 +102,9 @@ public:
    void SetEndMethod(      DicomDir::Method *method,
                            void *arg = NULL, 
                            DicomDir::Method *argDelete = NULL );
-   void SetStartMethodArgDelete( DicomDir::Method *m );
+   void SetStartMethodArgDelete   ( DicomDir::Method *m );
    void SetProgressMethodArgDelete( DicomDir::Method *m );
-   void SetEndMethodArgDelete( DicomDir::Method *m );
+   void SetEndMethodArgDelete     ( DicomDir::Method *m );
 
    /// GetProgress GetProgress
    float GetProgress()  { return Progress; };
@@ -102,6 +116,8 @@ public:
    // Write
    bool WriteDicomDir(std::string const &fileName);
 
+   bool AnonymizeDicomDir();
+
    /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
@@ -122,7 +138,7 @@ protected:
 private:
    void Initialize();
    void CreateDicomDir();
-
+   bool DoTheLoadingJob();
    bool AddPatientToEnd(DicomDirPatient *dd);
    bool AddStudyToEnd  (DicomDirStudy *dd);
    bool AddSerieToEnd  (DicomDirSerie *dd);
@@ -131,16 +147,16 @@ private:
    void SetElements(std::string const &path, VectDocument const &list);
    void SetElement (std::string const &path, DicomDirType type,
                     Document *header);
-   void MoveSQItem(DocEntrySet *dst,DocEntrySet *src);
+   void MoveSQItem(DocEntrySet *dst, DocEntrySet *src);
 
    static bool HeaderLessThan(Document *header1, Document *header2);
    
 // Variables
 
    /// Pointer on *the* DicomDirObject 'DicomDirMeta Elements'
-   DicomDirMeta* MetaElems;
+   DicomDirMeta *MetaElems;
 
-   /// Chained list of DicomDirPatient (to be exploited recursively) 
+   /// Chained list of DicomDirPatient (to be exploited hierarchicaly) 
    ListDicomDirPatient Patients;
    ListDicomDirPatient::iterator ItPatient;
 
@@ -166,6 +182,7 @@ private:
    float Progress;
    /// value of the ??? for any progress bar   
    bool Abort;
+   bool ParseDir;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------