ENH: Move the old setup.py to its new home

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 8001f2d990cb47604808c18b20593c7425f9522c..c11d06801529288e436707f669f3ec660cfde550 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/10/10 00:42:54 $
+  Version:   $Revision: 1.25 $
                                                                                 
   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,31 @@
 
 #include "gdcmDictEntry.h"
 #include "gdcmDebug.h"
+#include "gdcmUtil.h"
 
-#include <stdio.h>    // FIXME For sprintf
 
 //-----------------------------------------------------------------------------
 // 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(guint16 InGroup, guint16 InElement,
-                             std::string  InVr, std::string InFourth,
-                             std::string  InName)
+gdcmDictEntry::gdcmDictEntry(uint16_t group, uint16_t element,
+                             std::string vr, std::string fourth,
+                             std::string 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);
 }
 
 //-----------------------------------------------------------------------------
@@ -51,38 +51,36 @@ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \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)
+gdcmTagKey gdcmDictEntry::TranslateToKey(uint16_t group, uint16_t 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;
+   gdcmTagKey key = gdcmUtil::Format("%04x|%04x", group , element);
+
+   return key;
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \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 gdcmDictEntry::SetVR(std::string const & vr) 
 {
-       if ( IsVRUnknown() )
-               vr = NewVr;
-       else 
+   if ( IsVRUnknown() )
    {
-               dbg.Error(true, "gdcmDictEntry::SetVR",
-                         "Overwriting vr might compromise a dictionary");
-       }
+      VR = vr;
+   }
+   else 
+   {
+      dbg.Error(true, "gdcmDictEntry::SetVR",
+                       "Overwriting VR might compromise a dictionary");
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -92,4 +90,3 @@ void gdcmDictEntry::SetVR(std::string NewVr)
 // Private
 
 //-----------------------------------------------------------------------------
-