X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirMeta.cxx;h=ec3d35b4d4ca69c3dcc1af5f9c7d371f2f8bd535;hb=90034aefc764a5b6c4815c9073606d36956acab1;hp=116acf30bb08a54eb0cb35082332e3f44fa3ca51;hpb=ab0aa4fa11e3ac7ec236d1aceb6f0cf89fe83eae;p=gdcm.git

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 116acf30..ec3d35b4 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/09/23 10:47:10 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.27 $
                                                                                 
   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,59 +18,50 @@
 
 #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() 
-{
-   
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Prints the Meta Elements
- */ 
-void gdcmDicomDirMeta::Print(std::ostream &os)
+DicomDirMeta::~DicomDirMeta() 
 {
-   os << "META" << std::endl;
-   // warning : META doesn't behave exactly like a gdcmObjet 
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
-        ++i)
-      (*i)->Print();    
 }
 
-
 //-----------------------------------------------------------------------------
 // Public
-
-
 /**
  * \brief   Writes the Meta Elements
+ * @param fp ofstream to write to
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  * @return
  */ 
-void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
 {   
-   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, filetype);
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -80,3 +71,25 @@ void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \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 & )
+{
+   os << "META" << std::endl;
+   // 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;
+   }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm