Some normalizations :

[gdcm.git] / src / gdcmDicomDirMeta.cxx

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index d04756c4a7d2be62a0f02745e2c3ec146a229f3d..b008d0e54be55337ac555d9b4fcdb2bc85289e38 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/09/24 11:39:21 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/01/23 10:12:33 $
+  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
@@ -18,42 +18,55 @@
 
 #include "gdcmDicomDirMeta.h"
 #include "gdcmDocument.h"
+#include "gdcmDocEntry.h"
+#include "gdcmGlobal.h"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \ingroup gdcmMeta
  * \brief  Constructor
  */ 
-gdcmDicomDirMeta::gdcmDicomDirMeta(TagDocEntryHT* ptagHT):
-   gdcmDicomDirObject(ptagHT)
+DicomDirMeta::DicomDirMeta(bool empty):
+   DicomDirObject()
 {
-
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirMetaElements();
+      FillObject(elemList);
+   }
 }
 
 /**
- * \ingroup gdcmDicomDirMeta
  * \brief   Canonical destructor.
  */
-gdcmDicomDirMeta::~gdcmDicomDirMeta() 
+DicomDirMeta::~DicomDirMeta() 
 {
-   
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
  * \brief   Prints the Meta Elements
+ * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
  */ 
-void gdcmDicomDirMeta::Print(std::ostream& os)
+void DicomDirMeta::Print(std::ostream &os, std::string const & )
 {
    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;
+   }
 }
 
 
@@ -63,14 +76,18 @@ void gdcmDicomDirMeta::Print(std::ostream& os)
 
 /**
  * \brief   Writes the Meta Elements
+ * @param fp ofstream to write to
+ * @param t File Type 
  * @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 +97,4 @@ void gdcmDicomDirMeta::Write(FILE* fp, FileType t)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm