BUG: Solve seg fault with SerieHelper by properly using sort algorithm when needed...

[gdcm.git] / src / gdcmDicomDirImage.cxx

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 5a12172ec205491405edcca6737a78b2b94e2da9..8950538cd4cb904b97bbba041b92bb4e9de4ffd9 100644 (file)
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 17:13:18 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,37 +18,52 @@
 
 #include "gdcmDicomDirImage.h"
 #include "gdcmValEntry.h"
+#include "gdcmGlobal.h"
 
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup DicomDirImage
  * \brief  Constructor 
- * @param ptagHT pointer to the HTable (DicomDirObject needs it 
- *               to build the DocEntries)
+ * \note End user must use : DicomDirSerie::NewImage()
  */
-DicomDirImage::DicomDirImage():
+DicomDirImage::DicomDirImage(bool empty):
    DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirImageElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirImageElements();
+      FillObject(elemList);
+   }
 }
+
 /**
- * \ingroup DicomDirImage
  * \brief   Canonical destructor.
  */
 DicomDirImage::~DicomDirImage() 
 {
 }
 
+//-----------------------------------------------------------------------------
+// Public
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup DicomDirImage
  * \brief   Prints the Object
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
  * @return
  */ 
-void DicomDirImage::Print(std::ostream &os)
+void DicomDirImage::Print(std::ostream &os, std::string const & )
 {
    os << "IMAGE : ";
    for(ListDocEntry::iterator i = DocEntries.begin();
@@ -57,7 +72,7 @@ void DicomDirImage::Print(std::ostream &os)
    {
       if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
       {
-         os << ((ValEntry *)(*i))->GetValue(); //FIXME
+         os << (dynamic_cast<ValEntry *>(*i))->GetValue(); //FIXME
       }
    }
    os << std::endl;
@@ -65,15 +80,6 @@ void DicomDirImage::Print(std::ostream &os)
    DicomDirObject::Print(os);
 }
 
-//-----------------------------------------------------------------------------
-// Public
-
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
-
 //-----------------------------------------------------------------------------
 } // end namespace gdcm