X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.h;h=dd3a4dc10eb2de16f6c339557ae6f221349f5bdb;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=2052d02576b89500866def097e0b58c6f1b40dda;hpb=233c8b3ebb1aee6b1be6723d842eb2241b9ffb91;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index 2052d025..dd3a4dc1 100644
--- 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: 2007/08/29 15:30:48 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,42 +16,56 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMPATIENT_H
-#define GDCMPATIENT_H
+#ifndef _GDCMPATIENT_H_
+#define _GDCMPATIENT_H_
 
 #include "gdcmDicomDirObject.h"
-#include "gdcmDicomDirStudy.h"
-#include "gdcmSQItem.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
+class DicomDirStudy;
 
 //-----------------------------------------------------------------------------
 typedef std::list<DicomDirStudy*> ListDicomDirStudy;
 
 //-----------------------------------------------------------------------------
+/**
+ * \brief   describes a PATIENT within a DICOMDIR (DicomDir)
+ */
+
 class GDCM_EXPORT DicomDirPatient : public DicomDirObject 
 {
+   gdcmTypeMacro(DicomDirPatient);
+
 public:
-   DicomDirPatient(); 
-   ~DicomDirPatient();
+/// \brief Constructs a DicomDirPatient with a RefCounter
+   static DicomDirPatient *New(bool empty=false) {return new DicomDirPatient(empty);}
 
-   void Print(std::ostream &os = std::cout);
-   void WriteContent(std::ofstream *fp, FileType t);
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
+   void WriteContent(std::ofstream *fp, FileType t, bool insideMetaElements, bool insideSequence );
+  
+   // Patient methods
+   /// \brief Adds a new gdcm::DicomDirStudy to the Patient
+   void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); }
+   DicomDirStudy *NewStudy(); 
+   void ClearStudy();
 
-   /// Returns the STUDY chained List for this PATIENT.
-   ListDicomDirStudy const & GetDicomDirStudies() const { return Studies; };
+   DicomDirStudy *GetFirstStudy();
+   DicomDirStudy *GetNextStudy();
+   DicomDirStudy *GetLastStudy();
+   /// returns the number of Studies currently held in the gdcm::DicomDirPatient
+   int            GetNumberOfStudies() { return Studies.size();}
+   virtual void Copy(DocEntrySet *set);
 
-   /// adds the passed STUDY to the STUDY chained List for this PATIENT.
-   void AddDicomDirStudy (DicomDirStudy *obj) { Studies.push_back(obj); };
+protected:
+   DicomDirPatient(bool empty=false); 
+   ~DicomDirPatient();
 
-   ///  TODO
-   DicomDirStudy* NewStudy(); 
-         
 private:
-
-   /// chained list of DicomDirStudy
+   /// chained list of DicomDirStudy  (to be exploited hierarchicaly)
    ListDicomDirStudy Studies;
+   /// iterator on the DicomDirStudies of the current DicomDirPatient
+   ListDicomDirStudy::iterator ItStudy;
 };
 } // end namespace gdcm