Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2005/06/14 14:00:03 $
- Version: $Revision: 1.49 $
+ Date: $Date: 2005/11/28 18:01:25 $
+ Version: $Revision: 1.57 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* @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);
}
//-----------------------------------------------------------------------------
// Public
+/**
+ * \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 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;
- }
- else
- {
- gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
- }
+ //gdcmAssertMacro( IsVRUnknown() );
+ DicomEntry::SetVR(vr);
}
/**
*/
void DictEntry::SetVM(TagName const &vm)
{
- if ( IsVMUnknown() )
- {
- VM = vm;
- }
- else
- {
- 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 !
- char res[10];
- sprintf(res,"%04x|%04x", group, elem);
- return res;
+ gdcmAssertMacro( IsVMUnknown() );
+ VM = vm;
}
//-----------------------------------------------------------------------------
* @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;
-
- vr = GetVR();
- if(vr==GDCM_UNKNOWN)
- vr=" ";
+ DicomEntry::Print(os,indent);
- 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()) << " ";