X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=66c29bcb5bd250865b76f60803d849769341fcdf;hb=1c4a6671c995962804086936a409bd0c8cb2b985;hp=9a5dd26551e40cf08bc9d9014681e7621c178592;hpb=7704f9459285edf11c7bcb4462e23fb864e3523e;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 9a5dd265..66c29bcb 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 08:20:25 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/11/29 12:48:46 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -83,9 +83,9 @@ void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
  */
 DicomDirSerie *DicomDirStudy::NewSerie()
 {
-   DicomDirSerie *st = new DicomDirSerie();
-   Series.push_back(st);
-   return st;
+   DicomDirSerie *dd = DicomDirSerie::New();
+   Series.push_back(dd);
+   return dd;
 } 
 
 /**
@@ -97,7 +97,7 @@ void DicomDirStudy::ClearSerie()
                                    cc != Series.end();
                                  ++cc )
    {
-      delete *cc;
+      (*cc)->Delete();
    }
    Series.clear();
 }
@@ -151,9 +151,10 @@ DicomDirSerie *DicomDirStudy::GetLastSerie()
  */
 DicomDirVisit *DicomDirStudy::NewVisit()
 {
-   DicomDirVisit *st = new DicomDirVisit();
-   Visits.push_back(st);
-   return st;
+   DicomDirVisit *dd = DicomDirVisit::New();
+   Visits.push_back(dd);
+   dd->Delete();
+   return dd;
 } 
 
 /**
@@ -165,7 +166,7 @@ void DicomDirStudy::ClearVisit()
                                    cc != Visits.end();
                                  ++cc )
    {
-      delete *cc;
+      (*cc)->Delete();
    }
    Visits.clear();
 }
@@ -212,6 +213,32 @@ DicomDirVisit *DicomDirStudy::GetLastVisit()
    return NULL;
 }
 
+/**
+ * \brief Copies all the attributes from an other DocEntrySet 
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void DicomDirStudy::Copy(DocEntrySet *set)
+{
+   // Remove all previous childs
+   ClearSerie();
+   ClearVisit();
+
+   DicomDirObject::Copy(set);
+
+   DicomDirStudy *ddEntry = dynamic_cast<DicomDirStudy *>(set);
+   if( ddEntry )
+   {
+      Series = ddEntry->Series;
+      for(ItSerie = Series.begin();ItSerie != Series.end();++ItSerie)
+         (*ItSerie)->Register();
+
+      Visits = ddEntry->Visits;
+      for(ItVisit = Visits.begin();ItVisit != Visits.end();++ItVisit)
+         (*ItVisit)->Register();
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected