* gdcmPython/gdcm.i : bug fix. Now string are correctly converted in python

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 7699a4a872272c3a8743ef76f640932cf0460510..e8366b249a14629b65a172b1064f0207de5cadad 100644 (file)
--- 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/16 04:50:41 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/02/02 15:07:41 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,70 +25,32 @@
 
 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);
-}
-
-//-----------------------------------------------------------------------------
-// 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;
+   Key     = TranslateToKey(group, elem);
 }
 
 //-----------------------------------------------------------------------------
 // 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
- * @return the built tag
- */
-TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
-{
-   return Util::Format("%04x|%04x", group, element);
-}
-
-//-----------------------------------------------------------------------------
 /**
  * \brief       If-and only if-the V(alue) R(epresentation)
  * \            is unset then overwrite it.
@@ -106,7 +68,6 @@ void DictEntry::SetVR(TagName const &vr)
    }
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief       If-and only if-the V(alue) M(ultiplicity)
  * \            is unset then overwrite it.
@@ -123,12 +84,54 @@ void DictEntry::SetVM(TagName const &vm)
       gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
+
+/**
+ * \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  elem the Dicom element number used to build the tag
+ * @return the built tag
+ */
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
+{
+   return Util::Format("%04x|%04x", group, elem);
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
 //-----------------------------------------------------------------------------
 // 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