Fix mistypings

[gdcm.git] / src / gdcmDicomDirPatient.cxx

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index c35b2f10a939d97715c2de7f5e3bf15560de9a88..c8cc875f876354c73702860af433fe5f2bcad480 100644 (file)
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:29:55 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,7 @@
 #include "gdcmSQItem.h"
 #include "gdcmDebug.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -31,10 +31,10 @@ namespace gdcm
  * \brief   Constructor
  * \note End user must use : DicomDir::NewPatient()
  */
-DicomDirPatient::DicomDirPatient(bool empty):
-   DicomDirObject()
+DicomDirPatient::DicomDirPatient(bool empty)
+                :DicomDirObject()
 {
-   if( !empty )
+   if ( !empty )
    {
       ListDicomDirStudyElem const &elemList = 
          Global::GetDicomDirElements()->GetDicomDirPatientElements();
@@ -57,15 +57,15 @@ DicomDirPatient::~DicomDirPatient()
  * @param fp ofstream to write to
  * @param t Type of the File (explicit VR, implicitVR, ...) 
  */ 
-void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t, bool , bool )
 {
-   DicomDirObject::WriteContent(fp, t);
+   DicomDirObject::WriteContent(fp, t, false, true);
 
    for(ListDicomDirStudy::iterator cc = Studies.begin();
                                    cc!= Studies.end();
                                  ++cc )
    {
-      (*cc)->WriteContent( fp, t );
+      (*cc)->WriteContent( fp, t, false, true );
    }
 }
 
@@ -75,9 +75,9 @@ void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
  */
 DicomDirStudy* DicomDirPatient::NewStudy()
 {
-   DicomDirStudy *st = new DicomDirStudy();
-   Studies.push_back(st);
-   return st; 
+   DicomDirStudy *dd = DicomDirStudy::New();
+   Studies.push_back(dd);
+   return dd; 
 }   
 
 /**
@@ -89,7 +89,7 @@ void DicomDirPatient::ClearStudy()
                                          cc != Studies.end(); 
                                        ++cc )
    {
-      delete *cc;
+      (*cc)->Delete();
    }
    Studies.clear();
 }
@@ -136,6 +136,27 @@ DicomDirStudy *DicomDirPatient::GetLastStudy()
    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 DicomDirPatient::Copy(DocEntrySet *set)
+{
+   // Remove all previous childs
+   ClearStudy();
+
+   DicomDirObject::Copy(set);
+
+   DicomDirPatient *ddEntry = dynamic_cast<DicomDirPatient *>(set);
+   if( ddEntry )
+   {
+      Studies = ddEntry->Studies;
+      for(ItStudy = Studies.begin();ItStudy != Studies.end();++ItStudy)
+         (*ItStudy)->Register();
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected