X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=1d0c7a5a693b29ca2ec762b094793c960f01a761;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=b74c9fdb5db21639ef0e1384038a69202f6e1d46;hpb=2f88e766a552cc0d0a6bf009bc26dea6a872c148;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index b74c9fdb..1d0c7a5a 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 22:06:47 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,51 +20,49 @@
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
 
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor
  * @param   group      DICOM-Group Number
- * @param   element    DICOM-Element Number
+ * @param   elem       DICOM-Element Number
  * @param   vr         Value Representation
  * @param   vm         Value Mutlplicity 
  * @param   name      description of the element
 */
 
-DictEntry::DictEntry(uint16_t group, uint16_t element,
+DictEntry::DictEntry(uint16_t group, uint16_t elem,
                      TagName const &vr, 
                      TagName const &vm,
                      TagName const &name)
 {
    Group   = group;
-   Element = element;
+   Element = elem;
    VR      = vr;
    VM      = vm;
    Name    = name;
-   Key     = TranslateToKey(group, element);
+   Key     = TranslateToKey(group, elem);
 }
 
-//-----------------------------------------------------------------------------
-// Print
-
 //-----------------------------------------------------------------------------
 // Public
 /**
  * \brief   concatenates 2 uint16_t (supposed to be a Dicom group number 
  *                                              and a Dicom element number)
  * @param  group the Dicom group number used to build the tag
- * @param  element the Dicom element number used to build the tag
+ * @param  elem the Dicom element number used to build the tag
  * @return the built tag
  */
-TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
 {
-   return Util::Format("%04x|%04x", group, element);
+   return Util::Format("%04x|%04x", group, elem);
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief       If-and only if-the V(alue) R(epresentation)
  * \            is unset then overwrite it.
@@ -82,11 +80,10 @@ 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) 
 {
@@ -105,6 +102,35 @@ void DictEntry::SetVM(TagName const &vm)
 //-----------------------------------------------------------------------------
 // Private
 
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints an entry of the Dicom DictionaryEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+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;
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm