X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=e3235ec8e4aa45933c421e3af20c68d8b61c2cb2;hb=cfd7023dd0efe6d0cf17cdc1b31bbf17ac8a9ade;hp=33ae75b94f4b49d48789b20200f548e947b19ca7;hpb=30d2b02b938fe912d866b40ca2b9842961481ab2;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 33ae75b9..e3235ec8 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -1,35 +1,47 @@
-// gdcmDicomDirPatient.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/17 10:59:52 $
+  Version:   $Revision: 1.25 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmGlobal.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmSQItem.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Constructor
- * @param  s SQ Item holding the elements related to this "PATIENT" part
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
  */
-gdcmDicomDirPatient::gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
-{
-   docEntries = s->GetDocEntries();
-}
-
-gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirPatient::DicomDirPatient():
+   DicomDirObject()
 {
 }
 /**
- * \ingroup gdcmDicomDirPatient
  * \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;
    }
@@ -38,43 +50,83 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Prints the Object
- * @return
+ * @param os ostream to write to 
  */ 
-void gdcmDicomDirPatient::Print(std::ostream &os)
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
 {
-   os<<"PATIENT"<<std::endl;
-   gdcmObject::Print(os);
+   os << "PATIENT" << std::endl;
+   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)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);
    }
 }
 
+/**
+ * \brief   Writes the Object
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...) 
+ */ 
+void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
+{
+   DicomDirObject::WriteContent(fp, t);
+
+   for(ListDicomDirStudy::iterator cc = Studies.begin();
+                                   cc!= Studies.end();
+                                 ++cc )
+   {
+      (*cc)->WriteContent( fp, t );
+   }
+}
 //-----------------------------------------------------------------------------
 // Public
 
 /**
- * \ingroup gdcmDicomDir
  * \brief   adds a new Patient at the begining of the PatientList
  *          of a partially created DICOMDIR
  */
-gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy(void) {
-   std::list<gdcmElement> elemList;   
-   elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+DicomDirStudy* DicomDirPatient::NewStudy()
+{
+   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   Initialise the visit of the DicomDirPatients
+ */
+void DicomDirPatient::InitTraversal()
+{
+   ItDicomDirStudy = Studies.begin();
+}
+
+/**
+ * \brief   Get the next entry while visiting the DicomDirStudies
+ * \return  The next DicomDirStudies if found, otherwhise NULL
+ */
+DicomDirStudy *DicomDirPatient::GetNextEntry()
+{
+   if (ItDicomDirStudy != Studies.end())
+   {
+      DicomDirStudy *tmp = *ItDicomDirStudy;
+      ++ItDicomDirStudy;
+      return tmp;
+   }
+   else
+   {
+      return NULL;
+   }
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -82,3 +134,5 @@ gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm