Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:55 $
- Version: $Revision: 1.44 $
+ Date: $Date: 2005/10/18 12:58:27 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iomanip> // for std::ios::left, ...
#include <fstream>
+#include <stdio.h> // for sprintf
namespace gdcm
{
* @param group DICOM-Group Number
* @param elem DICOM-Element Number
* @param vr Value Representation
- * @param vm Value Mutlplicity
- * @param name description of the element
+ * @param vm Value Multiplicity
+ * @param name description of the element
*/
DictEntry::DictEntry(uint16_t group, uint16_t elem,
- TagName const &vr,
+ VRKey const &vr,
TagName const &vm,
TagName const &name)
{
//-----------------------------------------------------------------------------
// 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 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);
-}
-
/**
* \brief If-and only if-the V(alue) R(epresentation)
* \ 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() )
{
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)
+{
+ // 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
*/
void DictEntry::Print(std::ostream &os, std::string const & )
{
- std::string vr;
+ VRKey vr;
std::ostringstream s;
vr = GetVR();
- if(vr==GDCM_UNKNOWN)
+ if ( IsVRUnknown() )
vr=" ";
s << DictEntry::TranslateToKey(GetGroup(),GetElement());
s << " [" << vr << "] ";
- if (PrintLevel >= 1)
+ if ( PrintLevel >= 1 )
{
s.setf(std::ios::left);
s << std::setw(66-GetName().length()) << " ";