* Remove missed FASTTAGKEY (due to the integration of the

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 3eede79dcf9f640e847a985274b4194454f5578a..2e7167d098ee9354c956952543d67900a9e39f55 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 18:37:55 $
-  Version:   $Revision: 1.64 $
+  Date:      $Date: 2005/10/20 09:23:24 $
+  Version:   $Revision: 1.70 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -88,7 +88,7 @@ Dict *DictSet::LoadDictFromFile(std::string const &filename,
 Dict *DictSet::GetDict(DictKey const &dictName) 
 {
    DictSetHT::iterator dict = Dicts.find(dictName);
-   if(dict != Dicts.end())
+   if ( dict != Dicts.end() )
    {
       return dict->second;
    }
@@ -106,25 +106,22 @@ Dict *DictSet::GetDict(DictKey const &dictName)
  */
 DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
                                          uint16_t elem,
-                                         TagName vr,
-                                         TagName vm,
-                                         TagName name)
+                                         const VRKey &vr,
+                                         const TagName &vm,
+                                         const TagName &name)
 {
    DictEntry *entry;
 
-  // Let's follow 'Purify' advice
-  //
-  // const std::string tag = DictEntry::TranslateToKey(group,elem)
-  //                         + "#" + vr + "#" + vm + "#" + name;
-   char res[10];
-   sprintf(res,"%04x|%04x", group, elem);
-   std::string tag = res;
-   tag += "#" + vr + "#" + vm + "#" + name;  
-  
-   TagKeyHT::iterator it;
+   // Let's follow 'Purify' advice
+   // const std::string tag = DictEntry::TranslateToKey(group,elem)
+   //                         + "#" + vr + "#" + vm + "#" + name;
+   ExtendedTagKey tag = DictEntry::TranslateToKey(group,elem).str();
+   tag += "#" + vr.str() + "#" + vm + "#" + name;  
+
+   ExtendedTagKeyHT::iterator it;
    
    it = VirtualEntries.find(tag);
-   if(it != VirtualEntries.end())
+   if ( it != VirtualEntries.end() )
    {
       entry = &(it->second);
    }
@@ -132,7 +129,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
    {
       DictEntry ent(group, elem, vr, vm, name);
       VirtualEntries.insert(
-         std::map<TagKey, DictEntry>::value_type(tag, ent) );
+         ExtendedTagKeyHT::value_type(tag, ent) );
       entry = &(VirtualEntries.find(tag)->second);
    }
 
@@ -146,7 +143,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
 Dict *DictSet::GetFirstEntry()
 {
    ItDictHt = Dicts.begin();
-   if( ItDictHt != Dicts.end() )
+   if ( ItDictHt != Dicts.end() )
       return ItDictHt->second;
    return NULL;
 }