X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirImage.cxx;h=e13bc8911ce4db4b6f1e7d2b627e59376d0b175c;hb=ef0e08814ac95a5412e8650112e23add221767d1;hp=a7024f1f4e53a766372ac7e807cc2067aa17d09a;hpb=d6f3715fc5f0acf5deeefd288703e24790d069cd;p=gdcm.git

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index a7024f1f..e13bc891 100644
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/28 17:01:29 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2007/05/23 14:18:08 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,10 +17,10 @@
 =========================================================================*/
 
 #include "gdcmDicomDirImage.h"
-#include "gdcmValEntry.h"
 #include "gdcmGlobal.h"
+#include "gdcmDataEntry.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -31,7 +31,7 @@ namespace gdcm
 DicomDirImage::DicomDirImage(bool empty):
    DicomDirObject()
 {
-   if( !empty )
+   if ( !empty )
    {
       ListDicomDirImageElem const &elemList = 
          Global::GetDicomDirElements()->GetDicomDirImageElements();
@@ -46,6 +46,15 @@ DicomDirImage::~DicomDirImage()
 {
 }
 
+//-----------------------------------------------------------------------------
+// Public
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -61,9 +70,10 @@ void DicomDirImage::Print(std::ostream &os, std::string const & )
                               i!= DocEntries.end();
                               ++i)
    {
-      if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
+      if ( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
       {
-         os << (dynamic_cast<ValEntry *>(*i))->GetValue(); //FIXME
+         if( dynamic_cast<DataEntry *>(*i) )
+            os << (dynamic_cast<DataEntry *>(*i))->GetString();
       }
    }
    os << std::endl;
@@ -71,15 +81,6 @@ void DicomDirImage::Print(std::ostream &os, std::string const & )
    DicomDirObject::Print(os);
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
-
 //-----------------------------------------------------------------------------
 } // end namespace gdcm