X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3b67a2a9110c0ef74a3e972a3ea198ab146e7f15;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=cfe420d81a88496853dc6fe7a6aedf1eaf537607;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index cfe420d8..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/10/19 13:17:04 $
-  Version:   $Revision: 1.53 $
+  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
@@ -24,7 +24,7 @@
 #include <fstream>
 #include <stdio.h> // for sprintf
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -36,51 +36,55 @@ namespace gdcm
  * @param   vm         Value Multiplicity 
  * @param   name       description of the element
 */
-
 DictEntry::DictEntry(uint16_t group, uint16_t elem,
                      VRKey const &vr, 
                      TagName const &vm,
-                     TagName const &name):
-   DicomEntry(group,elem,vr)
+                     TagName const &name)
 {
+   Tag.SetGroup(group);
+   Tag.SetElement(elem);
+   VR      = vr;
    VM      = vm;
    Name    = name;
 }
 
+/**
+ * \brief   Destructor
+ */
+DictEntry::~DictEntry()
+{
+}
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \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(VRKey const &vr) 
+ * \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)
 {
-   if ( IsVRUnknown() )
-   {
-      DicomEntry::SetVR(vr);
-   }
-   else 
-   {
-      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
-   }
+   return new DictEntry(group,elem,vr,vm,name);
 }
 
 /**
- * \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   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
  */
-void DictEntry::SetVM(TagName const &vm) 
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
 {
-   if ( IsVMUnknown() )
-   {
-      VM = vm;
-   }
-   else 
-   {
-      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
-   }
+   // according to 'Purify', TranslateToKey is one of the most
+   // time consuming methods.
+   // Let's try to shorten it !
+   return TagKey(group,elem);
 }
 
 //-----------------------------------------------------------------------------
@@ -96,11 +100,11 @@ 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 &indent )
+void DictEntry::Print(std::ostream &os, std::string const & )
 {
-   DicomEntry::Print(os,indent);
+   os << GetKey(); 
+   os << " [" << VR  << "] ";
 
-   VRKey vr;
    std::ostringstream s;
 
    if ( PrintLevel >= 1 )