X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDirMeta.cxx;h=11602a6659824365deb59109a39c39d97e2e4307;hb=dfd2b1cd2925e77ef9466cfb2fc71706c84a418c;hp=b21b126ff5df2e9805a963fd0d4ed23a3164ba17;hpb=ef0c45b292557174c768c2cc7fc11fea4d57e218;p=gdcm.git

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index b21b126f..11602a66 100644
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/18 07:53:42 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/01/24 16:10:52 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,7 @@
 #include "gdcmDicomDirMeta.h"
 #include "gdcmDocument.h"
 #include "gdcmDocEntry.h"
+#include "gdcmGlobal.h"
 
 namespace gdcm 
 {
@@ -29,9 +30,15 @@ namespace gdcm
 /**
  * \brief  Constructor
  */ 
-DicomDirMeta::DicomDirMeta():
+DicomDirMeta::DicomDirMeta(bool empty):
    DicomDirObject()
 {
+   if( !empty )
+   {
+      ListDicomDirStudyElem const &elemList = 
+         Global::GetDicomDirElements()->GetDicomDirMetaElements();
+      FillObject(elemList);
+   }
 }
 
 /**
@@ -46,6 +53,7 @@ DicomDirMeta::~DicomDirMeta()
 /**
  * \brief   Prints the Meta Elements
  * @param os ostream to write to 
+ * @param indent Indentation string to be prepended during printing
  */ 
 void DicomDirMeta::Print(std::ostream &os, std::string const & )
 {
@@ -69,16 +77,16 @@ void DicomDirMeta::Print(std::ostream &os, std::string const & )
 /**
  * \brief   Writes the Meta Elements
  * @param fp ofstream to write to
- * @param t File Type 
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  * @return
  */ 
-void DicomDirMeta::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
 {   
    for (ListDocEntry::iterator i = DocEntries.begin();  
                               i != DocEntries.end();
                               ++i)
    {
-      (*i)->WriteContent(fp, t);
+      (*i)->WriteContent(fp, filetype);
    }
 }
 
@@ -89,5 +97,4 @@ void DicomDirMeta::WriteContent(std::ofstream *fp, FileType t)
 // Private
 
 //-----------------------------------------------------------------------------
-
 } // end namespace gdcm