X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=72081cf3a763f166569d9caa664ba97d9eb039fe;hb=c67ffef593e7635d8dfa7d3fe63d702e5afafc3e;hp=f6a149a9441bae6430f4df28ad29e610d447270f;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index f6a149a9..72081cf3 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/11/25 15:46:11 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/01/25 15:44:23 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,10 @@
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmSQItem.h"
+#include "gdcmDebug.h"
+
 namespace gdcm 
 {
 
@@ -26,44 +30,34 @@ namespace gdcm
 // Constructor / Destructor
 /**
  * \brief   Constructor
- * @param  s SQ Item holding the elements related to this "PATIENT" part
- * @param ptagHT pointer to the HTable (DicomDirObject needs it 
- *               to build the HeaderEntries)
  */
-DicomDirPatient::DicomDirPatient(SQItem *s, TagDocEntryHT *ptagHT) :
-   DicomDirObject(ptagHT)
-{
-   DocEntries = s->GetDocEntries();
-}
-/**
- * \brief   Constructor
- * @param ptagHT pointer to the HTable (DicomDirObject needs it 
- *               to build the HeaderEntries)
- */
-DicomDirPatient::DicomDirPatient(TagDocEntryHT* ptagHT):
-   DicomDirObject(ptagHT)
+DicomDirPatient::DicomDirPatient(bool empty):
+   DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirPatientElements();
+      FillObject(elemList);
+   }
 }
+
 /**
  * \brief   Canonical destructor.
  */
 DicomDirPatient::~DicomDirPatient() 
 {
-   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
-                                         cc != Studies.end(); 
-                                       ++cc )
-   {
-      delete *cc;
-   }
+   ClearStudy();
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
  * \brief   Prints the Object
- * @return
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
  */ 
-void DicomDirPatient::Print(std::ostream& os)
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
 {
    os << "PATIENT" << std::endl;
    DicomDirObject::Print(os);
@@ -77,11 +71,14 @@ void DicomDirPatient::Print(std::ostream& os)
    }
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /**
  * \brief   Writes the Object
- * @return
+ * @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)
 {
    DicomDirObject::WriteContent(fp, t);
 
@@ -92,8 +89,6 @@ void DicomDirPatient::WriteContent(std::ofstream* fp, FileType t)
       (*cc)->WriteContent( fp, t );
    }
 }
-//-----------------------------------------------------------------------------
-// Public
 
 /**
  * \brief   adds a new Patient at the begining of the PatientList
@@ -101,16 +96,67 @@ void DicomDirPatient::WriteContent(std::ofstream* fp, FileType t)
  */
 DicomDirStudy* DicomDirPatient::NewStudy()
 {
-   ListDicomDirStudyElem const & elemList = 
-      Global::GetDicomDirElements()->GetDicomDirStudyElements();
-      
-   DicomDirStudy* st = new DicomDirStudy( PtagHT );
-   st->FillObject(elemList);
-
-   Studies.push_front(st);
+   DicomDirStudy *st = new DicomDirStudy();
+   Studies.push_back(st);
    return st; 
 }   
 
+/**
+ * \brief  Remove all studies in the patient 
+ */
+void DicomDirPatient::ClearStudy()
+{
+   for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+                                         cc != Studies.end(); 
+                                       ++cc )
+   {
+      delete *cc;
+   }
+   Studies.clear();
+}
+
+/**
+ * \brief   Get the first entry while visiting the DicomDirStudy
+ * \return  The first DicomDirStudy if found, otherwhise NULL
+ */ 
+DicomDirStudy *DicomDirPatient::GetFirstStudy()
+{
+   ItStudy = Studies.begin();
+   if (ItStudy != Studies.end())
+      return *ItStudy;
+   return NULL;
+}
+
+/**
+ * \brief   Get the next entry while visiting the DicomDirStudies
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next DicomDirStudies if found, otherwhise NULL
+ */
+DicomDirStudy *DicomDirPatient::GetNextStudy()
+{
+   gdcmAssertMacro (ItStudy != Studies.end())
+
+   ++ItStudy;
+   if (ItStudy != Studies.end())
+      return *ItStudy;
+   return NULL;
+}
+
+/**
+ * \brief   Get the first entry while visiting the DicomDirStudy
+ * \return  The first DicomDirStudy if found, otherwhise NULL
+ */ 
+DicomDirStudy *DicomDirPatient::GetLastStudy()
+{
+   ItStudy = Studies.end();
+   if (ItStudy != Studies.begin())
+   {
+      --ItStudy;
+      return *ItStudy;
+   }
+   return NULL;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -118,5 +164,4 @@ DicomDirStudy* DicomDirPatient::NewStudy()
 // Private
 
 //-----------------------------------------------------------------------------
-
 } // end namespace gdcm