X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=cc2ba5b58d937cb7495d0d23e81a52a60a32d4cd;hb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;hp=50f80ddc32e7ea48a95d675e1c945beeeb74d02f;hpb=1bc5ccd72098866fc29ca8a786e8bb6852f388ea;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 50f80ddc..cc2ba5b5 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -1,40 +1,55 @@
-// gdcmDicomDirPatient.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/20 16:16:42 $
+  Version:   $Revision: 1.30 $
+                                                                                
+  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"
+#include "gdcmDebug.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Constructor
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "PATIENT" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'PATIENT' part
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
- * @param plistEntries pointer to the chained List (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
  */
-gdcmDicomDirPatient::gdcmDicomDirPatient(ListTag::iterator begin,
-                                         ListTag::iterator end,
-                                         TagHeaderEntryHT *ptagHT, 
-                                         ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+DicomDirPatient::DicomDirPatient(bool empty):
+   DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirPatientElements();
+      FillObject(elemList);
+   }
 }
 
 /**
- * \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;
    }
@@ -43,42 +58,97 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirPatient
  * \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;
-   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);
    }
 }
 
 //-----------------------------------------------------------------------------
 // Public
+/**
+ * \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 );
+   }
+}
 
 /**
- * \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();
-      
-   FillObject(elemList);
-   gdcmDicomDirStudy *st = new gdcmDicomDirStudy(i, j, ptagHT, plistEntries);
-   studies.push_front(st);
+DicomDirStudy* DicomDirPatient::NewStudy()
+{
+   DicomDirStudy *st = new DicomDirStudy();
+   Studies.push_back(st);
    return st; 
-
-  
 }   
 
+/**
+ * \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
 
@@ -86,3 +156,4 @@ gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm