X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirMeta.cxx;h=05ef4358200a760dea52a7614129167390432077;hb=d72e3cb0326093093f99863964f8f4df382c83e1;hp=e7202b02ed1847db51fa1318a0cc2a5b59debe68;hpb=4b47c82f84d8d13d4b06afdd71942d485119f089;p=gdcm.git

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index e7202b02..05ef4358 100644
--- 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/30 16:15:40 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.20 $
                                                                                 
   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,27 +18,29 @@
 
 #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() 
 {
-   
 }
 
 //-----------------------------------------------------------------------------
@@ -46,14 +48,18 @@ gdcmDicomDirMeta::~gdcmDicomDirMeta()
 /**
  * \brief   Prints the Meta Elements
  */ 
-void gdcmDicomDirMeta::Print(std::ostream &os)
+void DicomDirMeta::Print(std::ostream &os)
 {
    os << "META" << std::endl;
-   // warning : META doesn't behave exactly like a gdcmObjet 
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
+   // warning : META doesn't behave exactly like a Objet 
+   for (ListDocEntry::iterator i = DocEntries.begin();
+        i != DocEntries.end();
         ++i)
-      (*i)->Print();    
+   {
+      (*i)->SetPrintLevel(PrintLevel);
+      (*i)->Print();
+      os << std::endl;
+   }
 }
 
 
@@ -65,12 +71,14 @@ void gdcmDicomDirMeta::Print(std::ostream &os)
  * \brief   Writes the Meta Elements
  * @return
  */ 
-void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType t)
 {   
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
-        ++i)
-      (*i)->Write(fp, t);   
+   for (ListDocEntry::iterator i = DocEntries.begin();  
+                              i != DocEntries.end();
+                              ++i)
+   {
+      (*i)->WriteContent(fp, t);
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -80,3 +88,5 @@ void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm