X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=524f0f98e76db7330d05815aa8bf882070327d97;hb=f8be63ebb26fa8fc3381c4ac129138fabf229412;hp=3eede79dcf9f640e847a985274b4194454f5578a;hpb=6c6e713c8d6b0e0ed7cad7f6b4faa1af51433828;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 3eede79d..524f0f98 100644
--- 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/25 14:52:34 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,7 +36,7 @@ DictSet::DictSet()
    DictPath = BuildDictPath();
    std::string pubDictFile(DictPath);
    pubDictFile += PUB_DICT_FILENAME;
-   Dicts[PUB_DICT_NAME] = new Dict(pubDictFile);
+   Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile);
 }
 
 /**
@@ -47,17 +47,10 @@ DictSet::~DictSet()
    // Remove dictionaries
    for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
    {
-      Dict *entryToDelete = tag->second;
-      if ( entryToDelete )
-      {
-         delete entryToDelete;
-      }
-      tag->second = NULL;
+      if ( tag->second )
+         tag->second->Delete();
    }
    Dicts.clear();
-
-   // Remove virtual dictionary entries
-   VirtualEntries.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -73,8 +66,8 @@ DictSet::~DictSet()
 Dict *DictSet::LoadDictFromFile(std::string const &filename, 
                                 DictKey const &name) 
 {
-   Dict *newDict = new Dict(filename);
-   AppendDict(newDict, name);
+   Dict *newDict = Dict::New(filename);
+   Dicts[name] = newDict;
 
    return newDict;
 }
@@ -88,7 +81,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;
    }
@@ -96,67 +89,23 @@ Dict *DictSet::GetDict(DictKey const &dictName)
 }
 
 /**
- * \brief   Create a DictEntry which will be referenced in no dictionary
- * @param   group   Group number of the Entry 
- * @param   elem  Element number of the Entry
- * @param   vr  Value Representation of the Entry
- * @param   vm  Value Multiplicity of the Entry
- * @param   name  English name of the Entry
- * @return  virtual entry
- */
-DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
-                                         uint16_t elem,
-                                         TagName vr,
-                                         TagName vm,
-                                         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;
-   
-   it = VirtualEntries.find(tag);
-   if(it != VirtualEntries.end())
-   {
-      entry = &(it->second);
-   }
-   else
-   {
-      DictEntry ent(group, elem, vr, vm, name);
-      VirtualEntries.insert(
-         std::map<TagKey, DictEntry>::value_type(tag, ent) );
-      entry = &(VirtualEntries.find(tag)->second);
-   }
-
-   return entry;
-}
-
-/**
- * \brief   Get the first entry while visiting the DictSet
+ * \brief   Get the first dictionary while visiting the DictSet
  * \return  The first Dict if found, otherwhise NULL
  */
-Dict *DictSet::GetFirstEntry()
+Dict *DictSet::GetFirstDict()
 {
    ItDictHt = Dicts.begin();
-   if( ItDictHt != Dicts.end() )
+   if ( ItDictHt != Dicts.end() )
       return ItDictHt->second;
    return NULL;
 }
 
 /**
- * \brief   Get the next entry while visiting the Hash table (DictSetHT)
+ * \brief   Get the next dictionary while visiting the Hash table (DictSetHT)
  * \note : meaningfull only if GetFirstEntry already called
  * \return  The next Dict if found, otherwhise NULL
  */
-Dict *DictSet::GetNextEntry()
+Dict *DictSet::GetNextDict()
 {
    gdcmAssertMacro (ItDictHt != Dicts.end());
   
@@ -198,16 +147,6 @@ std::string DictSet::BuildDictPath()
 
 //-----------------------------------------------------------------------------
 // Protected
-/**
- * \brief   Adds a Dictionary to a DictSet
- * \return  always true
- */
-bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
-{
-   Dicts[name] = newDict;
-
-   return true;
-}
 
 //-----------------------------------------------------------------------------
 // Private