X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmDicomDirPatient.cxx;h=f6a149a9441bae6430f4df28ad29e610d447270f;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=fd2b25474ce3498e2ac3e6a3c2fb86089430023d;hpb=8a3dd7efbcb545e7ed308eb7334b1e6dbbf40923;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index fd2b2547..f6a149a9 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 03:35:19 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  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
@@ -49,8 +49,9 @@ DicomDirPatient::DicomDirPatient(TagDocEntryHT* ptagHT):
  */
 DicomDirPatient::~DicomDirPatient() 
 {
-   for(ListDicomDirStudy::iterator cc = studies.begin();
-                                   cc != studies.end(); ++cc)
+   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+                                         cc != Studies.end(); 
+                                       ++cc )
    {
       delete *cc;
    }
@@ -67,8 +68,9 @@ void DicomDirPatient::Print(std::ostream& os)
    os << "PATIENT" << std::endl;
    DicomDirObject::Print(os);
 
-   for(ListDicomDirStudy::iterator cc = studies.begin();
-                                   cc != studies.end(); ++cc)
+   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+                                         cc != Studies.end(); 
+                                       ++cc )
    {
       (*cc)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);
@@ -79,13 +81,15 @@ void DicomDirPatient::Print(std::ostream& os)
  * \brief   Writes the Object
  * @return
  */ 
-void DicomDirPatient::Write(std::ofstream* fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream* fp, FileType t)
 {
-   DicomDirObject::Write(fp, t);
+   DicomDirObject::WriteContent(fp, t);
 
-   for(ListDicomDirStudy::iterator cc = studies.begin();cc!=studies.end();++cc)
+   for(ListDicomDirStudy::iterator cc = Studies.begin();
+                                   cc!= Studies.end();
+                                 ++cc )
    {
-      (*cc)->Write( fp, t );
+      (*cc)->WriteContent( fp, t );
    }
 }
 //-----------------------------------------------------------------------------
@@ -97,13 +101,13 @@ void DicomDirPatient::Write(std::ofstream* fp, FileType t)
  */
 DicomDirStudy* DicomDirPatient::NewStudy()
 {
-   std::list<Element> elemList = 
+   ListDicomDirStudyElem const & elemList = 
       Global::GetDicomDirElements()->GetDicomDirStudyElements();
       
    DicomDirStudy* st = new DicomDirStudy( PtagHT );
    st->FillObject(elemList);
 
-   studies.push_front(st);
+   Studies.push_front(st);
    return st; 
 }