X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.h;h=4f989ca48cb997fc66d40ec269bc1562ab5b7ca7;hb=47b54ba405f7bb1b1ce93f1db544d751b8eacc10;hp=cbd99e4a5774dbeb6ca42567f796d1c1fe396700;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index cbd99e4a..4f989ca4 100644
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/10/25 14:52:33 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -19,47 +19,51 @@
 #ifndef GDCMPATIENT_H
 #define GDCMPATIENT_H
 
-#include "gdcmObject.h"
-#include "gdcmDicomDirStudy.h"
-#include "gdcmSQItem.h"
+#include "gdcmDicomDirObject.h"
+
+namespace gdcm 
+{
+class DicomDirStudy;
+
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmDicomDirStudy *> ListDicomDirStudy;
+typedef std::list<DicomDirStudy*> ListDicomDirStudy;
 
 //-----------------------------------------------------------------------------
-class GDCM_EXPORT gdcmDicomDirPatient : public gdcmObject 
+/**
+ * \brief   describes a PATIENT within a DICOMDIR (DicomDir)
+ */
+
+class GDCM_EXPORT DicomDirPatient : public DicomDirObject 
 {
+   gdcmTypeMacro(DicomDirPatient);
+
 public:
-   gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT); 
-   gdcmDicomDirPatient(TagDocEntryHT *ptagHT); 
+   static DicomDirPatient *New(bool empty=false) {return new DicomDirPatient(empty);}
 
-   ~gdcmDicomDirPatient(void);
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
+   void WriteContent(std::ofstream *fp, FileType t);
+  
+   // Patient methods
+   /// \brief Adds a new gdcmDicomDirStudy to the Patient
+   void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); }
+   DicomDirStudy *NewStudy(); 
+   void ClearStudy();
 
-   virtual void Print(std::ostream &os = std::cout);
-/**
- * \ingroup gdcmDicomDirPatient
- * \brief   returns the STUDY chained List for this PATIENT.
- */
-   inline ListDicomDirStudy &GetDicomDirStudies() 
-      {return studies;};
-/**
- * \ingroup gdcmDicomDirPatient
- * \brief   adds the passed STUDY to the STUDY chained List for this PATIENT.
- */      
-   inline void AddDicomDirStudy(gdcmDicomDirStudy *obj) 
-      {studies.push_back(obj);};
-/**
- * \ingroup gdcmDicomDirPatient
- * \brief   TODO
- */ 
-   gdcmDicomDirStudy* NewStudy(void); 
-         
-private:
+   DicomDirStudy *GetFirstStudy();
+   DicomDirStudy *GetNextStudy();
+   DicomDirStudy *GetLastStudy();
 
-/**
-* \brief chained list of DicomDirStudy
-*/ 
-   ListDicomDirStudy studies;
+protected:
+   DicomDirPatient(bool empty=false); 
+   ~DicomDirPatient();
+
+private:
+   /// chained list of DicomDirStudy  (to be exploited hierarchicaly)
+   ListDicomDirStudy Studies;
+   /// iterator on the DicomDirStudies of the current DicomDirPatient
+   ListDicomDirStudy::iterator ItStudy;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif