BUG: very same bug when using char* instead of string

[gdcm.git] / src / gdcmDicomDirPatient.cxx

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 57358bbfd107a19ea58af75690fefbb69ec26dbb..e4c646d0275001f138edeefc362c6885add8a43a 100644 (file)
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -1,33 +1,49 @@
-// gdcmDicomDirPatient.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:47 $
+  Version:   $Revision: 1.8 $
+                                                                                
+  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 "gdcmUtil.h"
+#include "gdcmGlobal.h"
 
 //-----------------------------------------------------------------------------
 // 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  s SQ Item holding the elements 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 
+ */
+gdcmDicomDirPatient::gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
+{
+   docEntries = s->GetDocEntries();
+}
+/**
+ * \ingroup gdcmDicomDirPatient
+ * \brief   Constructor
+ * @param ptagHT pointer to the HTable (gdcmObject needs it 
  *               to build the gdcmHeaderEntries)
  */
-gdcmDicomDirPatient::gdcmDicomDirPatient(ListTag::iterator begin,
-                                         ListTag::iterator end,
-                                         TagHeaderEntryHT *ptagHT, 
-                                         ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
 {
 }
-
 /**
  * \ingroup gdcmDicomDirPatient
  * \brief   Canonical destructor.
@@ -71,8 +87,9 @@ gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy(void) {
    std::list<gdcmElement> elemList;   
    elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
       
-   FillObject(elemList);
-   gdcmDicomDirStudy *st = new gdcmDicomDirStudy(i, j, ptagHT, plistEntries);
+   gdcmDicomDirStudy *st = new gdcmDicomDirStudy( ptagHT);
+   st->FillObject(elemList);
+
    studies.push_front(st);
    return st;