Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/23 10:12:33 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2005/10/20 15:24:08 $
+ Version: $Revision: 1.54 $
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
{
-
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* @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)
+ TagName const &name):
+ DicomEntry(group,elem,vr)
{
- Group = group;
- Element = elem;
- VR = vr;
VM = vm;
Name = name;
- Key = TranslateToKey(group, elem);
-}
-
-//-----------------------------------------------------------------------------
-// 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;
}
//-----------------------------------------------------------------------------
// 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)
+ * \brief Class allocator
+ * @param group DICOM-Group Number
+ * @param elem DICOM-Element Number
+ * @param vr Value Representation
+ * @param vm Value Multiplicity
+ * @param name description of the element
+*/
+DictEntry *DictEntry::New(uint16_t group, uint16_t elem,
+ VRKey const &vr,
+ TagName const &vm,
+ TagName const &name)
{
- return Util::Format("%04x|%04x", group, elem);
+ return new DictEntry(group,elem,vr,vm,name);
}
-//-----------------------------------------------------------------------------
/**
* \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() )
{
- VR = vr;
+ DicomEntry::SetVR(vr);
}
else
{
}
}
-//-----------------------------------------------------------------------------
/**
* \brief If-and only if-the V(alue) M(ultiplicity)
* \ is unset then overwrite it.
gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
}
}
+
//-----------------------------------------------------------------------------
// 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 &indent )
+{
+ DicomEntry::Print(os,indent);
+
+ VRKey vr;
+ std::ostringstream s;
+
+ if ( PrintLevel >= 1 )
+ {
+ s.setf(std::ios::left);
+ s << std::setw(66-GetName().length()) << " ";
+ }
+
+ s << "[" << GetName()<< "]";
+ os << s.str() << std::endl;
+}
+
//-----------------------------------------------------------------------------
} // end namespace gdcm