X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=7699a4a872272c3a8743ef76f640932cf0460510;hb=cfd7023dd0efe6d0cf17cdc1b31bbf17ac8a9ade;hp=7baa9d1dfbcb18f9cc09a3a2bc0fcf0668682caa;hpb=70b9dde9da207191fa6d799fdf03c2aff7941273;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 7baa9d1d..7699a4a8 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 16:26:12 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,9 @@
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
 
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+
 namespace gdcm 
 {
 
@@ -49,6 +52,27 @@ DictEntry::DictEntry(uint16_t group, uint16_t element,
 
 //-----------------------------------------------------------------------------
 // Print
+void DictEntry::Print(std::ostream &os, std::string const & )
+{
+   std::string vr;
+   std::ostringstream s;
+
+   vr = GetVR();
+   if(vr==GDCM_UNKNOWN)
+      vr="  ";
+
+   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
+   s << " [" << vr  << "] ";
+
+   if (PrintLevel >= 1)
+   {
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
+   }
+
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
+}
 
 //-----------------------------------------------------------------------------
 // Public
@@ -78,8 +102,7 @@ void DictEntry::SetVR(TagName const &vr)
    }
    else 
    {
-      Debug::Error(true, "DictEntry::SetVR",
-                       "Overwriting VR might compromise a dictionary");
+      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
    }
 }
 
@@ -87,7 +110,7 @@ void DictEntry::SetVR(TagName const &vr)
 /**
  * \brief       If-and only if-the V(alue) M(ultiplicity)
  * \            is unset then overwrite it.
- * @param vr    New V(alue) M(ultiplicity) to be set.
+ * @param vm    New V(alue) M(ultiplicity) to be set.
  */
 void DictEntry::SetVM(TagName const &vm) 
 {
@@ -97,8 +120,7 @@ void DictEntry::SetVM(TagName const &vm)
    }
    else 
    {
-      dbg.Error(true, "DictEntry::SetVM",
-                       "Overwriting VM might compromise a dictionary");
+      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
 //-----------------------------------------------------------------------------