X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirImage.cxx;h=7cbb2c0a680ff228e0499fee4eb6c38b36d18428;hb=e00d30b2e0c279df62f8c0987ec4035718fa9379;hp=f17fe2eeb568cbe2ae746351d452f3ff47c3e0de;hpb=d7a36753bfb317ab76a8bef8dec6780abd472356;p=gdcm.git

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index f17fe2ee..7cbb2c0a 100644
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -1,67 +1,83 @@
-// gdcmDicomDirImage.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:44 $
+  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.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 "gdcmDicomDirImage.h"
+#include "gdcmValEntry.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // 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
- * @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)
+ * \ingroup DicomDirImage
+ * \brief  Constructor 
+ * @param  s  SQ Item holding the elements
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the DocEntries)
  */
-gdcmDicomDirImage::gdcmDicomDirImage(ListTag::iterator begin,
-                                     ListTag::iterator end,
-                                     TagHeaderEntryHT *ptagHT, 
-				     ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+DicomDirImage::DicomDirImage(SQItem *s, TagDocEntryHT *ptagHT):
+   DicomDirObject(ptagHT)
 {
+   docEntries = s->GetDocEntries();
 }
 
 /**
- * \ingroup gdcmDicomDirImage
+ * \ingroup DicomDirImage
+ * \brief  Constructor 
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the DocEntries)
+ */
+DicomDirImage::DicomDirImage(TagDocEntryHT *ptagHT):
+   DicomDirObject(ptagHT)
+{
+}
+/**
+ * \ingroup DicomDirImage
  * \brief   Canonical destructor.
  */
-gdcmDicomDirImage::~gdcmDicomDirImage() 
+DicomDirImage::~DicomDirImage() 
 {
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirImage
+ * \ingroup DicomDirImage
  * \brief   Prints the Object
  * @return
  */ 
-void gdcmDicomDirImage::Print(std::ostream &os)
+void DicomDirImage::Print(std::ostream &os)
 {
-   os<<"IMAGE : ";
-   for(ListTag::iterator i=beginObj;i!=endObj;++i)
+   os << "IMAGE : ";
+   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
    {
-      if( ((*i)->GetGroup()==0x0004) && ((*i)->GetElement()==0x1500) )
-         os<<(*i)->GetValue();
+      if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
+      {
+         os << ((ValEntry *)(*i))->GetValue(); //FIXME
+      }
    }
-   os<<std::endl;
+   os << std::endl;
 
-   gdcmObject::Print(os);
+   DicomDirObject::Print(os);
 }
 
-/**
- * \ingroup gdcmDicomDirImage
- * \brief   TODO
- * @return
- */
-gdcmDicomDirImage* gdcmDicomDirImage::NewImage(void) {}
-
 //-----------------------------------------------------------------------------
 // Public
 
@@ -72,3 +88,5 @@ gdcmDicomDirImage* gdcmDicomDirImage::NewImage(void) {}
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+