Bug fix in XCoherent filestet splitting

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index b7c522efd8a795497c370b7b638c46540ddf016b..32a5023a73c2f85391bc159403fe899d852da4c1 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 14:00:04 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2005/10/20 15:24:08 $
+  Version:   $Revision: 1.71 $
                                                                                 
   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 
 {
@@ -54,9 +55,6 @@ DictSet::~DictSet()
       tag->second = NULL;
    }
    Dicts.clear();
-
-   // Remove virtual dictionary entries
-   VirtualEntries.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -87,7 +85,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 +93,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());