* Test/PrintAllDocument.cxx: looping on files is now effective. It used to

[gdcm.git] / src / gdcmDicomDirImage.cxx

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 1d08986925166d908e0fa1a54535d56206ecc44c..445bbb974ddd23e254c3155363a6d6a6e3dc012b 100644 (file)
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -1,32 +1,43 @@
-// gdcmDicomDirImage.cxx
-//-----------------------------------------------------------------------------
-#include "gdcmDicomDirImage.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirImage.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 "gdcmDicomDirImage.h"
+#include "gdcmValEntry.h"
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
  * \ingroup gdcmDicomDirImage
- * \brief   
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "IMAGE" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'IMAGE' part
+ * \brief  Constructor 
+ * @param  s  SQ Item holdoing the elements
  * @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)
+ *               to build the gdcmDocEntries)
  */
-gdcmDicomDirImage::gdcmDicomDirImage(ListTag::iterator begin,
-                                     ListTag::iterator end,
-                                     TagHeaderEntryHT *ptagHT, 
-                                    ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+gdcmDicomDirImage::gdcmDicomDirImage(gdcmSQItem *s, TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
 {
+   docEntries = s->GetDocEntries();
 }
 
+gdcmDicomDirImage::gdcmDicomDirImage(TagDocEntryHT *ptagHT):
+   gdcmObject(ptagHT)
+{
+}
 /**
  * \ingroup gdcmDicomDirImage
  * \brief   Canonical destructor.
@@ -45,10 +56,10 @@ gdcmDicomDirImage::~gdcmDicomDirImage()
 void gdcmDicomDirImage::Print(std::ostream &os)
 {
    os<<"IMAGE : ";
-   for(ListTag::iterator i=beginObj;i!=endObj;++i)
+   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
    {
       if( ((*i)->GetGroup()==0x0004) && ((*i)->GetElement()==0x1500) )
-         os<<(*i)->GetValue();
+         os<<((gdcmValEntry *)(*i))->GetValue();
    }
    os<<std::endl;