X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=b74c9fdb5db21639ef0e1384038a69202f6e1d46;hb=2f88e766a552cc0d0a6bf009bc26dea6a872c148;hp=da623a2ef1dd79b6226bd3e1edb6e76e40e441ea;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index da623a2e..b74c9fdb 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,32 +1,50 @@
-// gdcmDictEntry.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/07 22:06:47 $
+  Version:   $Revision: 1.37 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDictEntry.h"
 #include "gdcmDebug.h"
+#include "gdcmUtil.h"
 
-#include <stdio.h>    // FIXME For sprintf
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDictEntry
  * \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   element    DICOM-Element Number
+ * @param   vr         Value Representation
+ * @param   vm         Value Mutlplicity 
+ * @param   name      description of the element
 */
 
-gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
-                             std::string  InVr, std::string InFourth,
-                             std::string  InName) {
-	group 	= InGroup;
-	element = InElement;
-	vr      = InVr;
-	fourth 	= InFourth;
-	name    = InName;
-	key     = TranslateToKey(group, element);
+DictEntry::DictEntry(uint16_t group, uint16_t element,
+                     TagName const &vr, 
+                     TagName const &vm,
+                     TagName const &name)
+{
+   Group   = group;
+   Element = element;
+   VR      = vr;
+   VM      = vm;
+   Name    = name;
+   Key     = TranslateToKey(group, element);
 }
 
 //-----------------------------------------------------------------------------
@@ -35,42 +53,52 @@ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmDictEntry
- * \brief   concatenates 2 guint16 (supposed to be a Dicom group number 
- *                                             and a Dicom element number)
- * @param  group the Dicom group   number used to build the tag
+ * \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
  */
-
-TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
-	char trash[10];
-	TagKey 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;
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
+{
+   return Util::Format("%04x|%04x", group, element);
 }
 
+//-----------------------------------------------------------------------------
 /**
- * \ingroup     gdcmDictEntry
  * \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;
-	else 
+   if ( IsVRUnknown() )
+   {
+      VR = vr;
+   }
+   else 
    {
-		dbg.Error(true, "gdcmDictEntry::SetVR",
-		          "Overwriting vr might compromise a dictionary");
-	}
+      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
+   }
 }
 
+//-----------------------------------------------------------------------------
+/**
+ * \brief       If-and only if-the V(alue) M(ultiplicity)
+ * \            is unset then overwrite it.
+ * @param vr    New V(alue) M(ultiplicity) to be set.
+ */
+void DictEntry::SetVM(TagName const &vm) 
+{
+   if ( IsVMUnknown() )
+   {
+      VM = vm;
+   }
+   else 
+   {
+      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
+   }
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -78,4 +106,5 @@ void gdcmDictEntry::SetVR(std::string NewVr)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm