ENH: Be more verbose on Win32

[gdcm.git] / src / gdcmDicomDirPatient.h

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index 3569e5055a7a131210b7e83a866feb4a9aec4c52..e1cc299e7f70490e997cfa716f50dc3701ca1da6 100644 (file)
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -1,48 +1,70 @@
-// gdcmDicomDirPatient.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.h,v $
+  Language:  C++
+  Date:      $Date: 2005/01/17 10:59:52 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMPATIENT_H
 #define GDCMPATIENT_H
 
-#include "gdcmObject.h"
-#include "gdcmDicomDirStudy.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 
 {
 public:
-   gdcmDicomDirPatient(ListTag::iterator begin,ListTag::iterator end,
-              TagHeaderEntryHT *ptagHT, ListTag *plistEntries); 
-   ~gdcmDicomDirPatient(void);
+   DicomDirPatient(); 
+   ~DicomDirPatient();
 
-   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); 
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
+   void WriteContent(std::ofstream *fp, FileType t);
+
+    // TODO Remove GetDicomDirStudies
+    // use InitTraversal + GetNextEntry instead.
+  
+   /// Returns the STUDY chained List for this PATIENT.
+   ListDicomDirStudy const &GetDicomDirStudies() const { return Studies; };
+
+   // should avoid exposing internal mechanism
+   void InitTraversal();
+   DicomDirStudy *GetNextEntry();
+
+   /// adds the passed STUDY to the STUDY chained List for this PATIENT.
+   void AddDicomDirStudy (DicomDirStudy *obj) { Studies.push_back(obj); };
+
+   DicomDirStudy *NewStudy(); 
          
 private:
 
-/**
-* \brief chained list of DicomDirStudy
-*/ 
-   ListDicomDirStudy studies;
+   /// chained list of DicomDirStudy  (to be exploited recursively)
+   ListDicomDirStudy Studies;
+   /// iterator on the DicomDirStudies of the current DicomDirPatient
+   ListDicomDirStudy::iterator ItDicomDirStudy;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif