X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=b173a08846f7dfeec47b4e6a08a74b8d41c863e6;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=b7c522efd8a795497c370b7b638c46540ddf016b;hpb=43a9d401c9db4db824a5817e1ef1f3791aba8630;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index b7c522ef..b173a088 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 14:00:04 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,10 +18,12 @@
 
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
+#include "gdcmGlobal.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
+#include <stdio.h>   // For sprintf
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 //-----------------------------------------------------------------------------
@@ -35,7 +37,9 @@ 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);
+   // Stored redundantly to avoid at access HTable DictSet every time.
+   Global::DefaultPubDict = Dicts[PUB_DICT_NAME];
 }
 
 /**
@@ -43,20 +47,14 @@ DictSet::DictSet()
  */
 DictSet::~DictSet() 
 {
+   Global::DefaultPubDict = 0; // just a pointer!
    // 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();
 }
 
 //-----------------------------------------------------------------------------
@@ -72,8 +70,10 @@ DictSet::~DictSet()
 Dict *DictSet::LoadDictFromFile(std::string const &filename, 
                                 DictKey const &name) 
 {
-   Dict *newDict = new Dict(filename);
-   AppendDict(newDict, name);
+   assert(Dicts.find(name)==Dicts.end());
+   ///\todo RemoveDict(name); when Dict already exist
+   Dict *newDict = Dict::New(filename);
+   Dicts[name] = newDict;
 
    return newDict;
 }
@@ -87,7 +87,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;
    }
@@ -95,67 +95,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());
   
@@ -172,41 +128,29 @@ Dict *DictSet::GetNextEntry()
  *          to "../Dicts/".
  * @return  path to directory containing the dictionaries
  */
-std::string DictSet::BuildDictPath() 
+std::string DictSet::BuildDictPath()
 {
    std::string resultPath;
-   const char *envPath;
-   envPath = getenv("GDCM_DICT_PATH");
+   const char *envPath = getenv("GDCM_DICT_PATH");
 
-   if (envPath && (strlen(envPath) != 0)) 
+   if (envPath && (strlen(envPath) != 0))
    {
       resultPath = envPath;
-      gdcmWarningMacro( "Dictionary path set from environnement");
-   } 
+      gdcmStaticWarningMacro( "Dictionary path set from environnement");
+   }
    else
    {
       resultPath = PUB_DICT_PATH;
    }
-   if ( resultPath[resultPath.length()-1] != '/' )
+   if ( resultPath.length() && resultPath[resultPath.length()-1] != '/' )
    {
       resultPath += '/';
    }
-
    return resultPath;
 }
 
 //-----------------------------------------------------------------------------
 // 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