Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2004/07/02 13:55:27 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2004/11/16 02:54:35 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmDictEntry.h"
#include "gdcmDebug.h"
+#include "gdcmUtil.h"
-#include <stdio.h> // FIXME For sprintf
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* \brief Constructor
- * @param InGroup DICOM-Group Number
- * @param InElement DICOM-Element Number
- * @param InVr Value Representatiion
- * @param InFourth // DO NOT use any longer;
+ * @param group DICOM-Group Number
+ * @param element DICOM-Element Number
+ * @param vr Value Representatiion
+ * @param fourth // DO NOT use any longer;
* NOT part of the Dicom Standard
- * @param InName description of the element
+ * @param name description of the element
*/
-gdcmDictEntry::gdcmDictEntry(uint16_t InGroup, uint16_t InElement,
- std::string InVr, std::string InFourth,
- std::string InName)
+DictEntry::DictEntry(uint16_t group, uint16_t element,
+ TagName const & vr, TagName const & fourth,
+ TagName const & name)
{
- group = InGroup;
- element = InElement;
- vr = InVr;
- fourth = InFourth;
- name = InName;
- key = TranslateToKey(group, element); /// \todo Frog MEMORY LEAK.
+ Group = group;
+ Element = element;
+ VR = vr;
+ Fourth = fourth;
+ Name = name;
+ Key = TranslateToKey(group, element);
}
//-----------------------------------------------------------------------------
// 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
+ * and a Dicom element number)
+ * @param group the Dicom group number used to build the tag
* @param element the Dicom element number used to build the tag
* @return the built tag
*/
-gdcmTagKey gdcmDictEntry::TranslateToKey(uint16_t group, uint16_t element)
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
{
- char trash[10];
- gdcmTagKey key;
- // CLEANME: better call the iostream<< with the hex manipulator on.
- // This requires some reading of the stdlibC++ sources to make the
- // proper call (or copy).
- sprintf(trash, "%04x|%04x", group , element);
- key = trash; // Convertion through assignement
- return key;
+ return Util::Format("%04x|%04x", group, element);
}
+//-----------------------------------------------------------------------------
/**
* \brief If-and only if-the V(alue) R(epresentation)
* \ is unset then overwrite it.
- * @param NewVr New V(alue) R(epresentation) to be set.
+ * @param vr New V(alue) R(epresentation) to be set.
*/
-void gdcmDictEntry::SetVR(std::string NewVr)
+void DictEntry::SetVR(TagName const & vr)
{
if ( IsVRUnknown() )
- vr = NewVr;
+ {
+ VR = vr;
+ }
else
{
- dbg.Error(true, "gdcmDictEntry::SetVR",
- "Overwriting vr might compromise a dictionary");
+ dbg.Error(true, "DictEntry::SetVR",
+ "Overwriting VR might compromise a dictionary");
}
}
// Private
//-----------------------------------------------------------------------------
+} // end namespace gdcm