Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2005/06/07 14:50:36 $
- Version: $Revision: 1.48 $
+ Date: $Date: 2006/02/16 20:06:13 $
+ Version: $Revision: 1.60 $
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, grrrr
+#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)
{
- Group = group;
- Element = elem;
+ Tag.SetGroup(group);
+ Tag.SetElement(elem);
VR = vr;
VM = vm;
Name = name;
- Key = TranslateToKey(group, elem);
}
-//-----------------------------------------------------------------------------
-// Public
/**
- * \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.
+ * \brief Destructor
*/
-void DictEntry::SetVR(TagName const &vr)
+DictEntry::~DictEntry()
{
- if ( IsVRUnknown() )
- {
- VR = vr;
- }
- else
- {
- gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
- }
}
-
+//-----------------------------------------------------------------------------
+// Public
/**
- * \brief If-and only if-the V(alue) M(ultiplicity)
- * \ is unset then overwrite it.
- * @param vm New V(alue) M(ultiplicity) to be set.
- */
-void DictEntry::SetVM(TagName const &vm)
+ * \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)
{
- if ( IsVMUnknown() )
- {
- VM = vm;
- }
- else
- {
- gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
- }
+ return new DictEntry(group,elem,vr,vm,name);
}
/**
// 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 !
- char res[10];
- sprintf(res,"%04x|%04x", group, elem);
- return res;
+ return TagKey(group,elem);
}
//-----------------------------------------------------------------------------
*/
void DictEntry::Print(std::ostream &os, std::string const & )
{
- std::string vr;
- std::ostringstream s;
+ os << GetKey();
+ os << " [" << VR << "] ";
- vr = GetVR();
- if(vr==GDCM_UNKNOWN)
- vr=" ";
-
- s << DictEntry::TranslateToKey(GetGroup(),GetElement());
- s << " [" << vr << "] ";
+ std::ostringstream s;
- if (PrintLevel >= 1)
+ if ( PrintLevel >= 1 )
{
s.setf(std::ios::left);
s << std::setw(66-GetName().length()) << " ";