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

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index bb4e748b..b74c9fdb 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:27 $
-  Version:   $Revision: 1.22 $
+  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.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
@@ -18,31 +18,33 @@
 
 #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; 
- *                       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(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 &vm,
+                     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;
+   VM      = vm;
+   Name    = name;
+   Key     = TranslateToKey(group, element);
 }
 
 //-----------------------------------------------------------------------------
@@ -52,39 +54,51 @@ gdcmDictEntry::gdcmDictEntry(uint16_t InGroup, uint16_t InElement,
 // 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");
+      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
 
@@ -92,4 +106,5 @@ void gdcmDictEntry::SetVR(std::string NewVr)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm