X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=08df0cd531b794e41cbc1503896002065ca98146;hb=c409cea027a78568fc06272becf98b4f0ede0513;hp=007eeaf0f9a53d6fa969cfcff265032cdaa9f4bf;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 007eeaf0..08df0cd5 100644
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -1,27 +1,54 @@
-// gdcmDicomDirPatient.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/09/23 10:47:10 $
+  Version:   $Revision: 1.12 $
+                                                                                
+  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.htm 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"
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDicomDirPatient
- * \brief   
- * @param   begin iterator of begin for the object
- * @param   end   iterator of end for the object
+ * \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(ListTag::iterator begin,ListTag::iterator end):
-   gdcmObject(begin,end)
+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)
 {
 }
-
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Canonical destructor.
  */
 gdcmDicomDirPatient::~gdcmDicomDirPatient() 
 {
-   for(ListDicomDirStudy::iterator cc = studies.begin();cc != studies.end();++cc)
+   for(ListDicomDirStudy::iterator cc = studies.begin();
+                                   cc != studies.end(); ++cc)
    {
       delete *cc;
    }
@@ -30,25 +57,54 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirPatient
  * \brief   Prints the Object
  * @return
  */ 
 void gdcmDicomDirPatient::Print(std::ostream &os)
 {
-   os<<"PATIENT"<<std::endl;
-   gdcmObject::Print(os);
+   os << "PATIENT" << std::endl;
+   gdcmDicomDirObject::Print(os);
 
-   for(ListDicomDirStudy::iterator cc = studies.begin();cc!=studies.end();++cc)
+   for(ListDicomDirStudy::iterator cc = studies.begin();
+                                   cc != studies.end(); ++cc)
    {
-      (*cc)->SetPrintLevel(printLevel);
+      (*cc)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);
    }
 }
 
+/**
+ * \brief   Writes the Object
+ * @return
+ */ 
+void gdcmDicomDirPatient::Write(FILE *fp, FileType t)
+{
+   gdcmDicomDirObject::Write(fp, t);
+
+   for(ListDicomDirStudy::iterator cc = studies.begin();cc!=studies.end();++cc)
+   {
+      (*cc)->Write( fp, t );
+   }
+}
 //-----------------------------------------------------------------------------
 // Public
 
+/**
+ * \brief   adds a new Patient at the begining of the PatientList
+ *          of a partially created DICOMDIR
+ */
+gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy()
+{
+   std::list<gdcmElement> elemList = 
+      gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+      
+   gdcmDicomDirStudy *st = new gdcmDicomDirStudy( PtagHT );
+   st->FillObject(elemList);
+
+   studies.push_front(st);
+   return st; 
+}   
+
 //-----------------------------------------------------------------------------
 // Protected