Program: gdcm
Module: $RCSfile: gdcmDictEntry.cxx,v $
Language: C++
- Date: $Date: 2004/07/02 13:55:27 $
- Version: $Revision: 1.22 $
+ 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
- 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
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // 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;
- * NOT part of the Dicom Standard
- * @param InName description of the element
+ * @param group DICOM-Group Number
+ * @param elem DICOM-Element Number
+ * @param vr Value Representation
+ * @param vm Value Multiplicity
+ * @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 elem,
+ VRKey const &vr,
+ TagName const &vm,
+ TagName const &name):
+ DicomEntry(group,elem,vr)
{
- group = InGroup;
- element = InElement;
- vr = InVr;
- fourth = InFourth;
- name = InName;
- key = TranslateToKey(group, element); /// \todo Frog MEMORY LEAK.
+ VM = vm;
+ Name = name;
}
-//-----------------------------------------------------------------------------
-// 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)
{
- 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 new DictEntry(group,elem,vr,vm,name);
}
/**
* \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(VRKey const &vr)
{
- if ( IsVRUnknown() )
- vr = NewVr;
- else
- {
- dbg.Error(true, "gdcmDictEntry::SetVR",
- "Overwriting vr might compromise a dictionary");
- }
+ //gdcmAssertMacro( IsVRUnknown() );
+ DicomEntry::SetVR(vr);
+}
+
+/**
+ * \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)
+{
+ gdcmAssertMacro( IsVMUnknown() );
+ VM = vm;
}
//-----------------------------------------------------------------------------
// 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);
+
+ 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