X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.h;h=08d435cc90df1c1d4c06562e85d2e5fcc259eba5;hb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;hp=eb3e7bde343056ea731ce390aeec2805e829ba2a;hpb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index eb3e7bde..08d435cc 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/08/26 15:29:52 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.16 $
                                                                                 
   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,39 @@
 #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 
+class GDCM_EXPORT DicomDirPatient : public DicomDirObject 
 {
 public:
-   gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT); 
-   gdcmDicomDirPatient(TagDocEntryHT *ptagHT); 
+   DicomDirPatient(); 
+   ~DicomDirPatient();
 
-   ~gdcmDicomDirPatient();
+   void Print(std::ostream &os = std::cout);
+   void WriteContent(std::ofstream *fp, FileType t);
 
-   virtual void Print(std::ostream &os = std::cout);
-   virtual void Write(FILE *fp, FileType t);
    /// Returns the STUDY chained List for this PATIENT.
-   ListDicomDirStudy &GetDicomDirStudies() { return studies; };
+   ListDicomDirStudy const &GetDicomDirStudies() const { return Studies; };
 
    /// adds the passed STUDY to the STUDY chained List for this PATIENT.
-   void AddDicomDirStudy(gdcmDicomDirStudy *obj) { studies.push_back(obj); };
+   void AddDicomDirStudy (DicomDirStudy *obj) { Studies.push_back(obj); };
 
    ///  TODO
-   gdcmDicomDirStudy* NewStudy(); 
+   DicomDirStudy *NewStudy(); 
          
 private:
 
    /// chained list of DicomDirStudy
-   ListDicomDirStudy studies;
+   ListDicomDirStudy Studies;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif