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

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 7c64268a..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: 2005/01/23 10:12:33 $
-  Version:   $Revision: 1.43 $
+  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
@@ -22,10 +22,10 @@
 
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
+#include <stdio.h> // for sprintf
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -33,54 +33,45 @@ 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)
 {
-   Group   = group;
-   Element = elem;
+   Tag.SetGroup(group);
+   Tag.SetElement(elem);
    VR      = vr;
    VM      = vm;
    Name    = name;
-   Key     = TranslateToKey(group, elem);
 }
 
-//-----------------------------------------------------------------------------
-// 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
+ * \brief   Destructor
  */
-void DictEntry::Print(std::ostream &os, std::string const & )
+DictEntry::~DictEntry()
 {
-   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 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)
@@ -90,49 +81,41 @@ void DictEntry::Print(std::ostream &os, std::string const & )
  */
 TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
 {
-   return Util::Format("%04x|%04x", group, elem);
+   // according to 'Purify', TranslateToKey is one of the most
+   // time consuming methods.
+   // Let's try to shorten it !
+   return TagKey(group,elem);
 }
 
 //-----------------------------------------------------------------------------
-/**
- * \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) 
-{
-   if ( IsVRUnknown() )
-   {
-      VR = vr;
-   }
-   else 
-   {
-      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
-   }
-}
+// Protected
 
 //-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
 /**
- * \brief       If-and only if-the V(alue) M(ultiplicity)
- * \            is unset then overwrite it.
- * @param vm    New V(alue) M(ultiplicity) 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 DictEntry::SetVM(TagName const &vm) 
+void DictEntry::Print(std::ostream &os, std::string const & )
 {
-   if ( IsVMUnknown() )
-   {
-      VM = vm;
-   }
-   else 
+   os << GetKey(); 
+   os << " [" << VR  << "] ";
+
+   std::ostringstream s;
+
+   if ( PrintLevel >= 1 )
    {
-      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
    }
-}
-//-----------------------------------------------------------------------------
-// Protected
 
-//-----------------------------------------------------------------------------
-// Private
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
+}
 
 //-----------------------------------------------------------------------------
 } // end namespace gdcm