X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=93a459cad3dab6104ed0ef41a01ff2753b3759b8;hb=233c8b3ebb1aee6b1be6723d842eb2241b9ffb91;hp=2ab6f894817e945d48864f501eb5b85ad22e59a0;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 2ab6f894..93a459ca 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -1,39 +1,46 @@
-// gdcmDicomDirPatient.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/12/03 17:13:18 $
+  Version:   $Revision: 1.20 $
+                                                                                
+  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 "gdcmUtil.h"
+#include "gdcmGlobal.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)
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the HeaderEntries)
  */
-gdcmDicomDirPatient::gdcmDicomDirPatient(ListTag::iterator begin,
-                                         ListTag::iterator end,
-                                         TagHeaderEntryHT *ptagHT, 
-                                         ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+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;
    }
@@ -42,40 +49,55 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Prints the Object
  * @return
  */ 
-void gdcmDicomDirPatient::Print(std::ostream &os)
+void DicomDirPatient::Print(std::ostream& os)
 {
-   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
+ * @return
+ */ 
+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();
       
-   FillObject(elemList);
-   gdcmDicomDirStudy *st = new gdcmDicomDirStudy(i, j, ptagHT, plistEntries);
-   studies.push_front(st);
-   return st; 
+   DicomDirStudy* st = new DicomDirStudy();
+   st->FillObject(elemList);
 
-  
+   Studies.push_front(st);
+   return st; 
 }   
 
 //-----------------------------------------------------------------------------
@@ -85,3 +107,5 @@ gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy(void) {
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm