Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2005/07/11 15:20:46 $
- Version: $Revision: 1.51 $
+ Date: $Date: 2005/10/19 13:17:04 $
+ Version: $Revision: 1.53 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
DictEntry::DictEntry(uint16_t group, uint16_t elem,
- TagName const &vr,
+ VRKey const &vr,
TagName const &vm,
- TagName const &name)
+ TagName const &name):
+ DicomEntry(group,elem,vr)
{
- Group = group;
- Element = elem;
- VR = vr;
VM = vm;
Name = name;
- Key = TranslateToKey(group, elem);
}
//-----------------------------------------------------------------------------
* \ is unset then overwrite it.
* @param vr New V(alue) R(epresentation) to be set.
*/
-void DictEntry::SetVR(TagName const &vr)
+void DictEntry::SetVR(VRKey const &vr)
{
if ( IsVRUnknown() )
{
- VR = vr;
+ DicomEntry::SetVR(vr);
}
else
{
}
}
-/**
- * \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)
-{
- // according to 'Purify', TranslateToKey is one of the most
- // time consuming methods.
- // Let's try to shorten it !
-
- //return Util::Format("%04x|%04x", group, elem); // too much time !
-#if FASTTAGKEY
- TagKey r;
- r.tab[0] = group;
- r.tab[1] = elem;
- return r;
-#else
- char res[10];
- sprintf(res,"%04x|%04x", group, elem);
- return res;
-#endif
-}
-
//-----------------------------------------------------------------------------
// Protected
* @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 & )
+void DictEntry::Print(std::ostream &os, std::string const &indent )
{
- std::string vr;
- std::ostringstream s;
+ DicomEntry::Print(os,indent);
- vr = GetVR();
- if ( vr==GDCM_UNKNOWN )
- vr=" ";
-
- s << DictEntry::TranslateToKey(GetGroup(),GetElement());
- s << " [" << vr << "] ";
+ VRKey vr;
+ std::ostringstream s;
if ( PrintLevel >= 1 )
{