X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3b67a2a9110c0ef74a3e972a3ea198ab146e7f15;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=c11d06801529288e436707f669f3ec660cfde550;hpb=c9dd24ae7aab3c9f32af740ebfce6dfb47bd855f;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index c11d0680..3b67a2a9 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/10 00:42:54 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,73 +20,103 @@
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
 
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // for sprintf
 
+namespace GDCM_NAME_SPACE 
+{
 //-----------------------------------------------------------------------------
 // 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)
 {
-   Group   = group;
-   Element = element;
+   Tag.SetGroup(group);
+   Tag.SetElement(elem);
    VR      = vr;
-   Fourth  = fourth;
+   VM      = vm;
    Name    = name;
-   Key     = TranslateToKey(group, element);
 }
 
-//-----------------------------------------------------------------------------
-// Print
-
+/**
+ * \brief   Destructor
+ */
+DictEntry::~DictEntry()
+{
+}
 //-----------------------------------------------------------------------------
 // Public
+/**
+ * \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)
+{
+   return new DictEntry(group,elem,vr,vm,name);
+}
+
 /**
  * \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
+ * @param  elem 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 elem)
 {
-   gdcmTagKey key = gdcmUtil::Format("%04x|%04x", group , element);
-
-   return key;
+   // according to 'Purify', TranslateToKey is one of the most
+   // time consuming methods.
+   // Let's try to shorten it !
+   return TagKey(group,elem);
 }
 
 //-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
 /**
- * \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.
+ * \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 gdcmDictEntry::SetVR(std::string const & vr) 
+void DictEntry::Print(std::ostream &os, std::string const & )
 {
-   if ( IsVRUnknown() )
-   {
-      VR = vr;
-   }
-   else 
+   os << GetKey(); 
+   os << " [" << VR  << "] ";
+
+   std::ostringstream s;
+
+   if ( PrintLevel >= 1 )
    {
-      dbg.Error(true, "gdcmDictEntry::SetVR",
-                       "Overwriting VR might compromise a dictionary");
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
    }
-}
 
-//-----------------------------------------------------------------------------
-// Protected
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
+}
 
 //-----------------------------------------------------------------------------
-// Private
+} // end namespace gdcm
 
-//-----------------------------------------------------------------------------