X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirImage.cxx;h=e13bc8911ce4db4b6f1e7d2b627e59376d0b175c;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=7d2c5668f48872f372df53459ee803d8c0d92afa;hpb=4b4569ba7d0829cf3782ff6b5bbe5ae1009466e6;p=gdcm.git

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 7d2c5668..e13bc891 100644
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 02:39:09 $
-  Version:   $Revision: 1.8 $
+  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
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  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
@@ -17,64 +17,70 @@
 =========================================================================*/
 
 #include "gdcmDicomDirImage.h"
-#include "gdcmValEntry.h"
+#include "gdcmGlobal.h"
+#include "gdcmDataEntry.h"
+
+namespace GDCM_NAME_SPACE 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
- * \ingroup gdcmDicomDirImage
  * \brief  Constructor 
- * @param  s  SQ Item holdoing the elements
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmDocEntries)
+ * \note End user must use : DicomDirSerie::NewImage()
  */
-gdcmDicomDirImage::gdcmDicomDirImage(gdcmSQItem *s, TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirImage::DicomDirImage(bool empty):
+   DicomDirObject()
 {
-   docEntries = s->GetDocEntries();
+   if ( !empty )
+   {
+      ListDicomDirImageElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirImageElements();
+      FillObject(elemList);
+   }
 }
 
-gdcmDicomDirImage::gdcmDicomDirImage(TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
-{
-}
 /**
- * \ingroup gdcmDicomDirImage
  * \brief   Canonical destructor.
  */
-gdcmDicomDirImage::~gdcmDicomDirImage() 
+DicomDirImage::~DicomDirImage() 
 {
 }
 
+//-----------------------------------------------------------------------------
+// Public
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirImage
  * \brief   Prints the Object
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
  * @return
  */ 
-void gdcmDicomDirImage::Print(std::ostream &os)
+void DicomDirImage::Print(std::ostream &os, std::string const & )
 {
    os << "IMAGE : ";
-   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
+   for(ListDocEntry::iterator i = DocEntries.begin();
+                              i!= DocEntries.end();
+                              ++i)
    {
-      if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
+      if ( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
       {
-         os << ((gdcmValEntry *)(*i))->GetValue(); //FIXME
+         if( dynamic_cast<DataEntry *>(*i) )
+            os << (dynamic_cast<DataEntry *>(*i))->GetString();
       }
    }
    os << std::endl;
 
-   gdcmObject::Print(os);
+   DicomDirObject::Print(os);
 }
 
 //-----------------------------------------------------------------------------
-// Public
-
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
+} // end namespace gdcm
 
-//-----------------------------------------------------------------------------