X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=f51c9f4cd0a8b4d8e3a1e5c73fe659d7241673b1;hb=aedf83c26c99c5e632f159b91138b0e178b9fb4b;hp=e7c6808feb714d6d9df6c731ca28682b2f652a44;hpb=cc8f86d8d77d1e831a04d5c80ec95f2f125c5313;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index e7c6808f..f51c9f4c 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/02 14:52:25 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2005/07/21 05:02:11 $
+  Version:   $Revision: 1.66 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,7 @@
 #define GDCMDICOMDIR_H
 
 #include "gdcmDocument.h"
+#include "gdcmDebug.h"
 
 #include <list>
 #include <vector>
@@ -32,11 +33,12 @@ class DicomDirMeta;
 class DicomDirElement;
 class DicomDirStudy;
 class DicomDirSerie;
+class DicomDirVisit;
 class DicomDirImage;
 class SQItem;
 
-typedef std::list<DicomDirPatient *>   ListDicomDirPatient;
-typedef std::vector<Document *>  VectDocument;
+typedef std::list<DicomDirPatient *> ListDicomDirPatient;
+typedef std::vector<Document *> VectDocument;
 
 //-----------------------------------------------------------------------------
 /**
@@ -49,22 +51,35 @@ 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(); 
-                   
+   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ); 
    ~DicomDir();
 
-   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
-
+   GDCM_LEGACY( 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
+   GDCM_LEGACY( void SetParseDir(bool 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 +93,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,20 +103,22 @@ 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; };
+   float GetProgress()   { return Progress; }
    /// AbortProgress AbortProgress
-   void  AbortProgress() { Abort = true; };
+   void  AbortProgress() { Abort = true; }
    /// IsAborted IsAborted
-   bool  IsAborted() { return Abort; };
+   bool  IsAborted() { return Abort; }
 
    // Write
    bool WriteDicomDir(std::string const &fileName);
 
+   bool AnonymizeDicomDir();
+
    /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
@@ -110,6 +127,7 @@ public:
       GDCM_DICOMDIR_PATIENT,
       GDCM_DICOMDIR_STUDY,
       GDCM_DICOMDIR_SERIE,
+      GDCM_DICOMDIR_VISIT,
       GDCM_DICOMDIR_IMAGE
    } DicomDirType;
    
@@ -122,50 +140,52 @@ protected:
 private:
    void Initialize();
    void CreateDicomDir();
-
+   bool DoTheLoadingJob();
    bool AddPatientToEnd(DicomDirPatient *dd);
    bool AddStudyToEnd  (DicomDirStudy *dd);
    bool AddSerieToEnd  (DicomDirSerie *dd);
+   bool AddVisitToEnd  (DicomDirVisit *dd);
    bool AddImageToEnd  (DicomDirImage *dd);
 
    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;
 
    /// pointer to the initialisation method for any progress bar   
-   Method* StartMethod;
+   Method *StartMethod;
    /// pointer to the incrementation method for any progress bar
-   Method* ProgressMethod;
+   Method *ProgressMethod;
    /// pointer to the termination method for any progress bar
-   Method* EndMethod;
+   Method *EndMethod;
    /// pointer to the ??? method for any progress bar   
-   Method* StartMethodArgDelete;
+   Method *StartMethodArgDelete;
    /// pointer to the ??? method for any progress bar
    Method* ProgressMethodArgDelete;
    /// pointer to the ??? method for any progress bar
-   Method* EndMethodArgDelete;
+   Method *EndMethodArgDelete;
    /// pointer to the ??? for any progress bar   
-   void* StartArg;
+   void *StartArg;
    /// pointer to the ??? for any progress bar
-   void* ProgressArg;
+   void *ProgressArg;
    /// pointer to the ??? for any progress bar   
-   void* EndArg;
+   void *EndArg;
    /// value of the ??? for any progress bar
    float Progress;
    /// value of the ??? for any progress bar   
    bool Abort;
+   bool ParseDir;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------