ENH: Pass 2 at cleaning the JPEG mess. Still some work to do, but things are getting...

[gdcm.git] / src / gdcmDicomDirPatient.h

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index 2052d02576b89500866def097e0b58c6f1b40dda..5ef17805aa867d0bb9346d1faad6f32c5733c9f6 100644 (file)
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 17:13:18 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/01/25 11:11:58 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,38 +20,45 @@
 #define GDCMPATIENT_H
 
 #include "gdcmDicomDirObject.h"
-#include "gdcmDicomDirStudy.h"
-#include "gdcmSQItem.h"
 
 namespace gdcm 
 {
+class DicomDirStudy;
 
 //-----------------------------------------------------------------------------
 typedef std::list<DicomDirStudy*> ListDicomDirStudy;
 
 //-----------------------------------------------------------------------------
+/**
+ * \brief   describes a PATIENT within a DICOMDIR (DicomDir)
+ */
+
 class GDCM_EXPORT DicomDirPatient : public DicomDirObject 
 {
 public:
-   DicomDirPatient(); 
+   DicomDirPatient(bool empty=false); 
    ~DicomDirPatient();
 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
    void WriteContent(std::ofstream *fp, FileType t);
-
-   /// Returns the STUDY chained List for this PATIENT.
-   ListDicomDirStudy const & GetDicomDirStudies() const { return Studies; };
+  
+   // should avoid exposing internal mechanism
+   DicomDirStudy *GetFirstStudy();
+   DicomDirStudy *GetNextStudy();
+   DicomDirStudy *GetLastStudy();
 
    /// adds the passed STUDY to the STUDY chained List for this PATIENT.
-   void AddDicomDirStudy (DicomDirStudy *obj) { Studies.push_back(obj); };
+   void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); };
+   DicomDirStudy *NewStudy(); 
 
-   ///  TODO
-   DicomDirStudy* NewStudy(); 
+   void ClearStudy();
          
 private:
 
-   /// chained list of DicomDirStudy
+   /// chained list of DicomDirStudy  (to be exploited recursively)
    ListDicomDirStudy Studies;
+   /// iterator on the DicomDirStudies of the current DicomDirPatient
+   ListDicomDirStudy::iterator ItStudy;
 };
 } // end namespace gdcm