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

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 02063318..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/02/01 10:29:55 $
-  Version:   $Revision: 1.57 $
+  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
@@ -20,6 +20,7 @@
 #include "gdcmDebug.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
+#include <stdio.h>   // For sprintf
 
 namespace gdcm 
 {
@@ -35,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);
 }
 
 /**
@@ -46,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
-   VirtualEntry.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -69,11 +63,11 @@ DictSet::~DictSet()
  * @param   name Symbolic name that be used as identifier of the newly 
  *          created dictionary.
  */
-Dict *DictSet::LoadDictFromFile(std::string const & filename, 
-                                DictKey const & name) 
+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;
 }
@@ -87,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;
    }
@@ -95,36 +89,30 @@ Dict *DictSet::GetDict(DictKey const &dictName)
 }
 
 /**
- * \brief   Create a DictEntry which will be referenced 
- *          in no dictionary
- * @return  virtual entry
+ * \brief   Get the first dictionary while visiting the DictSet
+ * \return  The first Dict if found, otherwhise NULL
  */
-DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
-                                         uint16_t element,
-                                         TagName vr,
-                                         TagName vm,
-                                         TagName name)
+Dict *DictSet::GetFirstDict()
 {
-   DictEntry *entry;
-   const std::string tag = DictEntry::TranslateToKey(group,element)
-                           + "#" + vr + "#" + vm + "#" + name;
-   TagKeyHT::iterator it;
-   
-   it = VirtualEntry.find(tag);
-   if(it != VirtualEntry.end())
-   {
-      entry = &(it->second);
-   }
-   else
-   {
-      DictEntry ent(group, element, vr, vm, name);
-      VirtualEntry.insert(
-         std::map<TagKey, DictEntry>::value_type
-            (tag, ent));
-      entry = &(VirtualEntry.find(tag)->second);
-   }
+   ItDictHt = Dicts.begin();
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
+}
 
-   return entry;
+/**
+ * \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::GetNextDict()
+{
+   gdcmAssertMacro (ItDictHt != Dicts.end());
+  
+   ++ItDictHt;
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
 /**
@@ -137,65 +125,28 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
 std::string DictSet::BuildDictPath() 
 {
    std::string resultPath;
-   const char *envPath = 0;
+   const char *envPath;
    envPath = getenv("GDCM_DICT_PATH");
 
    if (envPath && (strlen(envPath) != 0)) 
    {
       resultPath = envPath;
-      if ( resultPath[resultPath.length()-1] != '/' )
-      {
-         resultPath += '/';
-      }
-      gdcmVerboseMacro( "Dictionary path set from environnement");
+      gdcmWarningMacro( "Dictionary path set from environnement");
    } 
    else
    {
       resultPath = PUB_DICT_PATH;
    }
+   if ( resultPath[resultPath.length()-1] != '/' )
+   {
+      resultPath += '/';
+   }
 
    return resultPath;
 }
 
-/**
- * \brief   Get the first entry while visiting the DictSet
- * \return  The first Dict if found, otherwhise NULL
- */
-Dict *DictSet::GetFirstEntry()
-{
-   ItDictHt = Dicts.begin();
-   if( ItDictHt != Dicts.end() )
-      return ItDictHt->second;
-   return NULL;
-}
-
-/**
- * \brief   Get the next entry while visiting the Hash table (DictSetHT)
- * \note : meaningfull only if GetFirstEntry already called
- * \return  The next Dict if found, otherwhise NULL
- */
-Dict *DictSet::GetNextEntry()
-{
-   gdcmAssertMacro (ItDictHt != Dicts.end());
-  
-   ++ItDictHt;
-   if ( ItDictHt != Dicts.end() )
-      return ItDictHt->second;
-   return NULL;
-}
-
 //-----------------------------------------------------------------------------
 // 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