X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=4939bf6333b6469189ae412c8e8641e4152949b0;hb=916ae67b44d778882539541c31ed430f002e5bf3;hp=1d0c7a5a693b29ca2ec762b094793c960f01a761;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 1d0c7a5a..4939bf63 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:29:55 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2005/10/20 15:24:08 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
+#include <stdio.h> // for sprintf
 
 namespace gdcm 
 {
@@ -32,35 +33,35 @@ namespace gdcm
  * @param   group      DICOM-Group Number
  * @param   elem       DICOM-Element Number
  * @param   vr         Value Representation
- * @param   vm         Value Mutlplicity 
- * @param   name      description of the element
+ * @param   vm         Value Multiplicity 
+ * @param   name       description of the element
 */
-
 DictEntry::DictEntry(uint16_t group, uint16_t elem,
-                     TagName const &vr, 
+                     VRKey const &vr, 
                      TagName const &vm,
-                     TagName const &name)
+                     TagName const &name):
+   DicomEntry(group,elem,vr)
 {
-   Group   = group;
-   Element = elem;
-   VR      = vr;
    VM      = vm;
    Name    = name;
-   Key     = TranslateToKey(group, elem);
 }
 
 //-----------------------------------------------------------------------------
 // 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  elem the Dicom element number used to build the tag
- * @return the built tag
- */
-TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
+ * \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 Util::Format("%04x|%04x", group, elem);
+   return new DictEntry(group,elem,vr,vm,name);
 }
 
 /**
@@ -68,11 +69,11 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
  * \            is unset then overwrite it.
  * @param vr    New V(alue) R(epresentation) to be set.
  */
-void DictEntry::SetVR(TagName const &vr) 
+void DictEntry::SetVR(VRKey const &vr) 
 {
    if ( IsVRUnknown() )
    {
-      VR = vr;
+      DicomEntry::SetVR(vr);
    }
    else 
    {
@@ -96,6 +97,7 @@ void DictEntry::SetVM(TagName const &vm)
       gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -109,19 +111,14 @@ void DictEntry::SetVM(TagName const &vm)
  * @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 & )
+void DictEntry::Print(std::ostream &os, std::string const &indent )
 {
-   std::string vr;
-   std::ostringstream s;
+   DicomEntry::Print(os,indent);
 
-   vr = GetVR();
-   if(vr==GDCM_UNKNOWN)
-      vr="  ";
-
-   s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
-   s << " [" << vr  << "] ";
+   VRKey vr;
+   std::ostringstream s;
 
-   if (PrintLevel >= 1)
+   if ( PrintLevel >= 1 )
    {
       s.setf(std::ios::left);
       s << std::setw(66-GetName().length()) << " ";