X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=7c64268a0d35afba40fb079c8604997419f565f6;hb=0ad9dae4659b21bfd5c834c1af724eab4dcdf4f6;hp=a4bb7060bcdb5a1a0c98042ccc1392e6abb2a88e;hpb=f81c61f9ca9f0c33f35e04f2c1c1ffa11a09db59;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index a4bb7060..7c64268a 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/13 16:35:37 $ - Version: $Revision: 1.39 $ + Date: $Date: 2005/01/23 10:12:33 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,28 +31,33 @@ namespace gdcm /** * \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 -void DictEntry::Print(std::ostream &os) +/** + * \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; @@ -71,7 +76,7 @@ void DictEntry::Print(std::ostream &os) } s << "[" << GetName()<< "]"; - os << s.str(); + os << s.str() << std::endl; } //----------------------------------------------------------------------------- @@ -80,12 +85,12 @@ void DictEntry::Print(std::ostream &os) * \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); } //-----------------------------------------------------------------------------