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 f4cc06e8837e380e1ff1db4c839f998d274278bc..5ef17805aa867d0bb9346d1faad6f32c5733c9f6 100644 (file)
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.h,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 02:39:09 $
-  Version:   $Revision: 1.6 $
+  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
-  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,37 +19,48 @@
 #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 
 {
 public:
-   gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT); 
-   gdcmDicomDirPatient(TagDocEntryHT *ptagHT); 
-
-   ~gdcmDicomDirPatient();
-
-   virtual void Print(std::ostream &os = std::cout);
+   DicomDirPatient(bool empty=false); 
+   ~DicomDirPatient();
 
-   /// Returns the STUDY chained List for this PATIENT.
-   ListDicomDirStudy &GetDicomDirStudies() { return studies; };
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
+   void WriteContent(std::ofstream *fp, FileType t);
+  
+   // 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(gdcmDicomDirStudy *obj) { studies.push_back(obj); };
+   void AddStudy(DicomDirStudy *obj) { Studies.push_back(obj); };
+   DicomDirStudy *NewStudy(); 
 
-   ///  TODO
-   gdcmDicomDirStudy* NewStudy(); 
+   void ClearStudy();
          
 private:
 
-   /// 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 ItStudy;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif