X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3e88c55f0a4f9728c6c8e7831abe734b7f4e18b3;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=c37c793842eebf843e0772a0c4893d25b0ac051a;hpb=1a7deed00e1d42de85b4ad27e6978b9f2885e218;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index c37c7938..3e88c55f 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/09 02:57:11 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/07/11 15:20:46 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,69 +20,98 @@
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
 
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // for sprintf
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // 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,
+                     TagName const &vr, 
+                     TagName const &vm,
+                     TagName const &name)
 {
    Group   = group;
-   Element = element;
+   Element = elem;
    VR      = vr;
-   Fourth  = fourth;
+   VM      = vm;
    Name    = name;
-   Key     = TranslateToKey(group, element);
+   Key     = TranslateToKey(group, elem);
 }
 
-//-----------------------------------------------------------------------------
-// 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
+ * \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.
  */
-gdcmTagKey gdcmDictEntry::TranslateToKey(uint16_t group, uint16_t element)
+void DictEntry::SetVR(TagName const &vr) 
 {
-   gdcmTagKey key = Format("%04x|%04x", group , element);
-
-   return key;
+   if ( IsVRUnknown() )
+   {
+      VR = vr;
+   }
+   else 
+   {
+      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
+   }
 }
 
-//-----------------------------------------------------------------------------
 /**
- * \brief       If-and only if-the V(alue) R(epresentation)
+ * \brief       If-and only if-the V(alue) M(ultiplicity)
  * \            is unset then overwrite it.
- * @param vr    New V(alue) R(epresentation) to be set.
+ * @param vm    New V(alue) M(ultiplicity) to be set.
  */
-void gdcmDictEntry::SetVR(std::string const & vr) 
+void DictEntry::SetVM(TagName const &vm) 
 {
-   if ( IsVRUnknown() )
+   if ( IsVMUnknown() )
    {
-      VR = vr;
+      VM = vm;
    }
    else 
    {
-      dbg.Error(true, "gdcmDictEntry::SetVR",
-                       "Overwriting VR might compromise a dictionary");
+      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
 
+/**
+ * \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  elem the Dicom element number used to build the tag
+ * @return the built tag
+ */
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
+{
+   // according to 'Purify', TranslateToKey is one of the most
+   // time consuming methods.
+   // Let's try to shorten it !
+ 
+   //return Util::Format("%04x|%04x", group, elem); // too much time !
+#if FASTTAGKEY
+   TagKey r;
+   r.tab[0] = group;
+   r.tab[1] = elem;
+   return r;
+#else
+   char res[10];
+   sprintf(res,"%04x|%04x", group, elem);
+   return res;
+#endif
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -90,3 +119,34 @@ void gdcmDictEntry::SetVR(std::string const & vr)
 // 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 & )
+{
+   std::string vr;
+   std::ostringstream s;
+
+   vr = GetVR();
+   if ( vr==GDCM_UNKNOWN )
+      vr="  ";
+
+   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
+   s << " [" << vr  << "] ";
+
+   if ( PrintLevel >= 1 )
+   {
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
+   }
+
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm
+