X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=7a5af4303ca529569e1ec02a675d36c3cccb9d34;hb=0068e5861800986e33ee5eeac99863c4e01e3512;hp=572d6f97c6e0ef9248684b57d5d4cc75c8fee829;hpb=5603c3d2b4ba248da2ec05555c5f076055041792;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 572d6f97..7a5af430 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/01/06 20:33:55 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2005/02/11 15:22:18 $
+  Version:   $Revision: 1.56 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,11 +39,12 @@ typedef std::list<DicomDirPatient *>   ListDicomDirPatient;
 typedef std::vector<Document *>  VectDocument;
 
 //-----------------------------------------------------------------------------
-
 /**
- * \ingroup DicomDir
- * \brief    DicomDir defines an object representing a DICOMDIR in memory.
- *
+ * \brief   DicomDir defines an object representing a DICOMDIR in memory
+ *  as a tree-like structure DicomDirPatient 
+ *                            -> DicomDirStudy 
+ *                                -> DicomDirSerie
+ *                                    -> DicomDirImage
  */
 class GDCM_EXPORT DicomDir: public Document
 {
@@ -55,21 +56,26 @@ public:
                    
    ~DicomDir();
 
-   /// \brief   canonical Printer 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
-   /// Informations contained in the parser
+   // Informations contained in the parser
    virtual bool IsReadable();
 
+   // Meta
+   DicomDirMeta    *NewMeta();
    /// Returns a pointer to the DicomDirMeta for this DICOMDIR. 
-   DicomDirMeta* GetDicomDirMeta() { return MetaElems; };
+   DicomDirMeta *GetMeta() { return MetaElems; };
+
+   // Patients
+   DicomDirPatient *NewPatient();
+   void ClearPatient();
 
-   /// Returns the PATIENT chained List for this DICOMDIR.    
-   ListDicomDirPatient const & GetDicomDirPatients() const { return Patients; };
+   DicomDirPatient *GetFirstPatient();
+   DicomDirPatient *GetNextPatient();
 
-   /// Parsing
+   // Parsing
    void ParseDirectory();
-   
+
    // 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.
@@ -88,18 +94,12 @@ public:
 
    /// GetProgress GetProgress
    float GetProgress()  { return Progress; };
-
    /// AbortProgress AbortProgress
    void  AbortProgress() { Abort = true; };
-
    /// IsAborted IsAborted
    bool  IsAborted() { return Abort; };
-   
-   /// Adding
-   DicomDirMeta    *NewMeta();
-   DicomDirPatient *NewPatient();
 
-   /// Write  
+   // Write
    bool WriteDicomDir(std::string const &fileName);
 
    /// Types of the DicomDirObject within the DicomDir
@@ -123,45 +123,45 @@ private:
    void Initialize();
    void CreateDicomDir();
 
-   bool AddDicomDirMeta();
-   bool AddDicomDirPatientToEnd(DicomDirPatient *dd);
-   bool AddDicomDirStudyToEnd  (DicomDirStudy *dd);
-   bool AddDicomDirSerieToEnd  (DicomDirSerie *dd);
-   bool AddDicomDirImageToEnd  (DicomDirImage *dd);
+   bool AddPatientToEnd(DicomDirPatient *dd);
+   bool AddStudyToEnd  (DicomDirStudy *dd);
+   bool AddSerieToEnd  (DicomDirSerie *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(SQItem *dst,SQItem *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