X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=abf4d1b2f0fd4b0dc210ab71efcbe481d0b0c94e;hb=e6ff7dc295436e9463650ea13ab965ce35ae126c;hp=d918485cd53baf31e72854bc0b8844cbc9d28558;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index d918485c..abf4d1b2 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/09/27 08:39:06 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,36 +19,30 @@
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmSQItem.h"
+#include "gdcmDebug.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor
- * @param  s SQ Item holding the elements related to this "PATIENT" part
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it 
- *               to build the gdcmHeaderEntries)
- */
-gdcmDicomDirPatient::gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmDicomDirObject(ptagHT)
-{
-   docEntries = s->GetDocEntries();
-}
-/**
- * \brief   Constructor
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it 
- *               to build the gdcmHeaderEntries)
  */
-gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT* ptagHT):
-   gdcmDicomDirObject(ptagHT)
+DicomDirPatient::DicomDirPatient():
+   DicomDirObject()
 {
 }
 /**
  * \brief   Canonical destructor.
  */
-gdcmDicomDirPatient::~gdcmDicomDirPatient() 
+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;
    }
@@ -58,15 +52,17 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient()
 // Print
 /**
  * \brief   Prints the Object
- * @return
+ * @param os ostream to write to 
+ * @param   indent indent
  */ 
-void gdcmDicomDirPatient::Print(std::ostream& os)
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
 {
    os << "PATIENT" << std::endl;
-   gdcmDicomDirObject::Print(os);
+   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);
@@ -75,15 +71,18 @@ void gdcmDicomDirPatient::Print(std::ostream& os)
 
 /**
  * \brief   Writes the Object
- * @return
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...) 
  */ 
-void gdcmDicomDirPatient::Write(FILE* fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
 {
-   gdcmDicomDirObject::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 );
    }
 }
 //-----------------------------------------------------------------------------
@@ -93,18 +92,45 @@ void gdcmDicomDirPatient::Write(FILE* fp, FileType t)
  * \brief   adds a new Patient at the begining of the PatientList
  *          of a partially created DICOMDIR
  */
-gdcmDicomDirStudy* gdcmDicomDirPatient::NewStudy()
+DicomDirStudy* DicomDirPatient::NewStudy()
 {
-   std::list<gdcmElement> elemList = 
-      gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+   ListDicomDirStudyElem const &elemList = 
+      Global::GetDicomDirElements()->GetDicomDirStudyElements();
       
-   gdcmDicomDirStudy* st = new gdcmDicomDirStudy( PtagHT );
+   DicomDirStudy *st = new DicomDirStudy();
    st->FillObject(elemList);
 
-   studies.push_front(st);
+   Studies.push_front(st);
    return st; 
 }   
 
+/**
+ * \brief   Get the first entry while visiting the DicomDirStudy
+ * \return  The first DicomDirStudy if found, otherwhise NULL
+ */ 
+DicomDirStudy *DicomDirPatient::GetFirstEntry()
+{
+   ItDicomDirStudy = Studies.begin();
+   if (ItDicomDirStudy != Studies.end())
+      return *ItDicomDirStudy;
+   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::GetNextEntry()
+{
+   gdcmAssertMacro (ItDicomDirStudy != Studies.end())
+   {
+      ++ItDicomDirStudy;
+      if (ItDicomDirStudy != Studies.end())
+         return *ItDicomDirStudy;
+   }
+   return NULL;
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -112,3 +138,5 @@ gdcmDicomDirStudy* gdcmDicomDirPatient::NewStudy()
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm