BUG: Actually fix the bug reported by Benoit. Stoopid typo, sorry

[gdcm.git] / src / gdcmDicomDirMeta.cxx

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 59d411283d0f20ded7ec5d560f78edc2f780c0ae..b1e40f543df216e2f677d1e95de7b775780d431d 100644 (file)
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 02:39:09 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.21 $
                                                                                 
   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
@@ -18,45 +18,69 @@
 
 #include "gdcmDicomDirMeta.h"
 #include "gdcmDocument.h"
+#include "gdcmDocEntry.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \ingroup gdcmMeta
+ * \ingroup DicomDirMeta
  * \brief  Constructor
  */ 
-gdcmDicomDirMeta::gdcmDicomDirMeta(TagDocEntryHT *ptagHT):
-   gdcmObject(ptagHT)
+DicomDirMeta::DicomDirMeta():
+   DicomDirObject()
 {
-
 }
 
 /**
- * \ingroup gdcmDicomDirMeta
+ * \ingroup DicomDirMeta
  * \brief   Canonical destructor.
  */
-gdcmDicomDirMeta::~gdcmDicomDirMeta() 
+DicomDirMeta::~DicomDirMeta() 
 {
-   
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirMeta
- * \brief   Prints the Object
- * @return
+ * \brief   Prints the Meta Elements
  */ 
-void gdcmDicomDirMeta::Print(std::ostream &os)
+void DicomDirMeta::Print(std::ostream &os, std::string const & )
 {
    os << "META" << std::endl;
-   gdcmObject::Print(os);
+   // warning : META doesn't behave exactly like a Objet 
+   for (ListDocEntry::iterator i = DocEntries.begin();
+        i != DocEntries.end();
+        ++i)
+   {
+      (*i)->SetPrintLevel(PrintLevel);
+      (*i)->Print();
+      os << std::endl;
+   }
 }
 
+
 //-----------------------------------------------------------------------------
 // Public
 
+
+/**
+ * \brief   Writes the Meta Elements
+ * @return
+ */ 
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType t)
+{   
+   for (ListDocEntry::iterator i = DocEntries.begin();  
+                              i != DocEntries.end();
+                              ++i)
+   {
+      (*i)->WriteContent(fp, t);
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -64,3 +88,5 @@ void gdcmDicomDirMeta::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm