X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=4939bf6333b6469189ae412c8e8641e4152949b0;hb=cb6cf86b2b3cc6b43d40561fb9552ebd19fdbc99;hp=186f2cb5c31730da39fd3493c422878a6b1497db;hpb=7e9537ac534af5c5b9c5231c1b7fdd7193c2255d;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 186f2cb5..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/01/17 17:27:03 $
-  Version:   $Revision: 1.42 $
+  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,10 +22,10 @@
 
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
+#include <stdio.h> // for sprintf
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -33,72 +33,47 @@ 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);
-}
-
-//-----------------------------------------------------------------------------
-// Print
-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;
 }
 
 //-----------------------------------------------------------------------------
 // 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);
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \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.
  */
-void DictEntry::SetVR(TagName const &vr) 
+void DictEntry::SetVR(VRKey const &vr) 
 {
    if ( IsVRUnknown() )
    {
-      VR = vr;
+      DicomEntry::SetVR(vr);
    }
    else 
    {
@@ -106,7 +81,6 @@ void DictEntry::SetVR(TagName const &vr)
    }
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief       If-and only if-the V(alue) M(ultiplicity)
  * \            is unset then overwrite it.
@@ -123,12 +97,37 @@ void DictEntry::SetVM(TagName const &vm)
       gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
+
 //-----------------------------------------------------------------------------
 // Protected
 
 //-----------------------------------------------------------------------------
 // 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 &indent )
+{
+   DicomEntry::Print(os,indent);
+
+   VRKey vr;
+   std::ostringstream s;
+
+   if ( PrintLevel >= 1 )
+   {
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
+   }
+
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm