X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=3dffdb3a6e1d2e437eee769db7bf8eb9120a7ca1;hb=d71e2e62b38383d9b960760f6d81c4d545d59fba;hp=417af7620663d9d357ddc05e6deacd002c934b02;hpb=55d77e0913ff360d639af1841c70d14dc8687584;p=gdcm.git

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 417af762..3dffdb3a 100644
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -1,33 +1,49 @@
-// gdcmDicomDirStudy.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:47 $
+  Version:   $Revision: 1.7 $
+                                                                                
+  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 "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirElement.h"
-#include "gdcmUtil.h"
+#include "gdcmGlobal.h"
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
  * \ingroup gdcmDicomDirStudy
  * \brief constructor  
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "STUDY" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'STUDY' part
+ * @param  s SQ Item holding the elements related to this "STUDY" part
  * @param ptagHT pointer to the HTable (gdcmObject needs it 
  *               to build the gdcmHeaderEntries)
- * @param plistEntries pointer to the chained List (gdcmObject needs it 
+ */
+gdcmDicomDirStudy::gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
+{
+   docEntries = s->GetDocEntries();
+}
+/**
+ * \ingroup gdcmDicomDirStudy
+ * \brief constructor  
+ * @param ptagHT pointer to the HTable (gdcmObject needs it 
  *               to build the gdcmHeaderEntries)
  */
-gdcmDicomDirStudy::gdcmDicomDirStudy(ListTag::iterator begin,
-                                     ListTag::iterator end,
-				     TagHeaderEntryHT *ptagHT, 
-				     ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+gdcmDicomDirStudy::gdcmDicomDirStudy(TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
 {
 }
-
 /**
  * \ingroup gdcmDicomDirStudy
  * \brief   Canonical destructor.
@@ -62,7 +78,7 @@ void gdcmDicomDirStudy::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 
-/*
+/**
  * \ingroup gdcmDicomStudy
  * \brief   adds a new Serie at the begining of the SerieList
  *          of a partially created DICOMDIR
@@ -72,8 +88,8 @@ gdcmDicomDirSerie * gdcmDicomDirStudy::NewSerie(void) {
    std::list<gdcmElement> elemList;
    elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();   
 
+   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(ptagHT);
    FillObject(elemList);
-   gdcmDicomDirSerie *st = new gdcmDicomDirSerie(i, j, ptagHT, plistEntries);
    series.push_front(st);
    return st;  
 }