* Fix compilation errors

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 8ec72b614d6ede6eefa1534915623f1493f6e9f9..63c03594624853c48d638dff83d64a0e4e1783ee 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/04/05 10:56:25 $
-  Version:   $Revision: 1.62 $
+  Date:      $Date: 2005/11/28 15:20:33 $
+  Version:   $Revision: 1.73 $
                                                                                 
   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();
 }
 
 //-----------------------------------------------------------------------------
@@ -72,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;
 }
@@ -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,56 +89,23 @@ Dict *DictSet::GetDict(DictKey const &dictName)
 }
 
 /**
- * \brief   Create a DictEntry which will be referenced 
- *          in no dictionary
- * @return  virtual entry
- */
-DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
-                                         uint16_t element,
-                                         TagName vr,
-                                         TagName vm,
-                                         TagName name)
-{
-   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);
-   }
-
-   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());
   
@@ -170,7 +131,7 @@ std::string DictSet::BuildDictPath()
    if (envPath && (strlen(envPath) != 0)) 
    {
       resultPath = envPath;
-      gdcmWarningMacro( "Dictionary path set from environnement");
+      gdcmStaticWarningMacro( "Dictionary path set from environnement");
    } 
    else
    {
@@ -186,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