X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=73680f8051df592defd78eac10bae7c8e14198f7;hb=d6b4e16455871f3d41fbddbbb305a2210d80bf02;hp=cc2ba5b58d937cb7495d0d23e81a52a60a32d4cd;hpb=ad8f0eb6ea1ad66c443b3640cded8a355efa7b42;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index cc2ba5b5..73680f80 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:16:42 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/10/25 14:52:33 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,16 +25,16 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \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();
@@ -47,33 +47,7 @@ DicomDirPatient::DicomDirPatient(bool empty):
  */
 DicomDirPatient::~DicomDirPatient() 
 {
-   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
-                                         cc != Studies.end(); 
-                                       ++cc )
-   {
-      delete *cc;
-   }
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Prints the Object
- * @param os ostream to write to 
- * @param   indent indent
- */ 
-void DicomDirPatient::Print(std::ostream &os, std::string const & )
-{
-   os << "PATIENT" << std::endl;
-   DicomDirObject::Print(os);
-
-   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
-                                         cc != Studies.end(); 
-                                       ++cc )
-   {
-      (*cc)->SetPrintLevel(PrintLevel);
-      (*cc)->Print(os);
-   }
+   ClearStudy();
 }
 
 //-----------------------------------------------------------------------------
@@ -96,16 +70,30 @@ void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
 }
 
 /**
- * \brief   adds a new Patient at the begining of the PatientList
+ * \brief   adds a new Patient at the beginning of the PatientList
  *          of a partially created DICOMDIR
  */
 DicomDirStudy* DicomDirPatient::NewStudy()
 {
-   DicomDirStudy *st = new DicomDirStudy();
-   Studies.push_back(st);
-   return st; 
+   DicomDirStudy *dd = DicomDirStudy::New();
+   Studies.push_back(dd);
+   return dd; 
 }   
 
+/**
+ * \brief  Remove all studies in the patient 
+ */
+void DicomDirPatient::ClearStudy()
+{
+   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+                                         cc != Studies.end(); 
+                                       ++cc )
+   {
+      (*cc)->Delete();
+   }
+   Studies.clear();
+}
+
 /**
  * \brief   Get the first entry while visiting the DicomDirStudy
  * \return  The first DicomDirStudy if found, otherwhise NULL
@@ -126,11 +114,10 @@ DicomDirStudy *DicomDirPatient::GetFirstStudy()
 DicomDirStudy *DicomDirPatient::GetNextStudy()
 {
    gdcmAssertMacro (ItStudy != Studies.end())
-   {
-      ++ItStudy;
-      if (ItStudy != Studies.end())
-         return *ItStudy;
-   }
+
+   ++ItStudy;
+   if (ItStudy != Studies.end())
+      return *ItStudy;
    return NULL;
 }
 
@@ -155,5 +142,26 @@ DicomDirStudy *DicomDirPatient::GetLastStudy()
 //-----------------------------------------------------------------------------
 // Private
 
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints the Object
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
+ */ 
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
+{
+   os << "PATIENT" << std::endl;
+   DicomDirObject::Print(os);
+
+   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+                                         cc != Studies.end(); 
+                                       ++cc )
+   {
+      (*cc)->SetPrintLevel(PrintLevel);
+      (*cc)->Print(os);
+   }
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm