X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDirImage.cxx;h=ba2134ab151f95aad522a223dff78aec1f87d12b;hb=0fd97a2f44764117b637de53e09b8a329ca133f8;hp=00a54a2018148e3c0b92d4b29b6cb987ae36575c;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 00a54a20..ba2134ab 100644
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -1,46 +1,82 @@
-// gdcmDicomDirImage.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/25 03:35:19 $
+  Version:   $Revision: 1.13 $
+                                                                                
+  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 of begin for the object
- * @param   end   iterator of end for the object
+ * \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):
-   gdcmObject(begin,end)
+DicomDirImage::DicomDirImage(SQItem *s, TagDocEntryHT *ptagHT):
+   DicomDirObject(ptagHT)
 {
+   DocEntries = s->GetDocEntries();
 }
 
 /**
- * \ingroup gdcmImage
+ * \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);
 }
 
 //-----------------------------------------------------------------------------
@@ -53,3 +89,5 @@ void gdcmDicomDirImage::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+