Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2004/10/09 02:57:11 $
- Version: $Revision: 1.24 $
+ 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 "gdcmDebug.h"
#include "gdcmUtil.h"
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // for sprintf
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* \brief Constructor
* @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 name description of the element
+ * @param elem DICOM-Element Number
+ * @param vr Value Representation
+ * @param vm Value Multiplicity
+ * @param name description of the element
*/
-
-gdcmDictEntry::gdcmDictEntry(uint16_t group, uint16_t element,
- std::string vr, std::string fourth,
- std::string name)
+DictEntry::DictEntry(uint16_t group, uint16_t elem,
+ VRKey const &vr,
+ TagName const &vm,
+ TagName const &name):
+ DicomEntry(group,elem,vr)
{
- Group = group;
- Element = element;
- VR = vr;
- Fourth = fourth;
+ VM = vm;
Name = name;
- Key = TranslateToKey(group, element);
}
-//-----------------------------------------------------------------------------
-// Print
-
//-----------------------------------------------------------------------------
// 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 element the Dicom element number used to build the tag
- * @return the built tag
- */
-gdcmTagKey gdcmDictEntry::TranslateToKey(uint16_t group, uint16_t element)
+ * \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)
{
- gdcmTagKey key = Format("%04x|%04x", group , element);
-
- return key;
+ 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 gdcmDictEntry::SetVR(std::string const & vr)
+void DictEntry::SetVR(VRKey const &vr)
{
if ( IsVRUnknown() )
{
- VR = vr;
+ DicomEntry::SetVR(vr);
+ }
+ else
+ {
+ gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
+ }
+}
+
+/**
+ * \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)
+{
+ if ( IsVMUnknown() )
+ {
+ VM = vm;
}
else
{
- dbg.Error(true, "gdcmDictEntry::SetVR",
- "Overwriting VR might compromise a dictionary");
+ gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
}
}
// 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
+