X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=149ecac0b2aae14a4be1c5f9744e5a901bede6a2;hb=9d913797d3bf5a18625f4d8d8b42c8f5c8c10d99;hp=a18a25faff4cb6b2b0395d29c63fc08a34da83e6;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index a18a25fa..149ecac0 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2005/01/07 19:20:38 $
+  Version:   $Revision: 1.48 $
                                                                                 
   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
+
 namespace gdcm 
 {
 
@@ -57,16 +58,7 @@ DictSet::~DictSet()
    Dicts.clear();
 
    // Remove virtual dictionnary entries
-   std::map<std::string,DictEntry *>::iterator it;
-   for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
-   {
-      DictEntry *entry = it->second;
-      if ( entry )
-      {
-         delete entry;
-      }
-      it->second = NULL;
-   }
+   VirtualEntry.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -77,7 +69,7 @@ DictSet::~DictSet()
  *          contained is this DictSet, along with their respective content.
  * @param   os Output stream used for printing.
  */
-void DictSet::Print(std::ostream& os) 
+void DictSet::Print(std::ostream &os) 
 {
    for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
    {
@@ -95,10 +87,13 @@ void DictSet::Print(std::ostream& os)
  * \sa DictSet::GetPubDictTagNamesByCategory
  * @return  A list of all entries of the public dicom dictionnary.
  */
-std::list<std::string> *DictSet::GetPubDictEntryNames() 
-{
-   return GetDefaultPubDict()->GetDictEntryNames();
-}
+
+// Probabely useless!
+ 
+//EntryNamesList *DictSet::GetPubDictEntryNames() 
+//{
+//   return GetDefaultPubDict()->GetDictEntryNames();
+//}
 
 /** 
  * \ingroup DictSet
@@ -109,6 +104,8 @@ std::list<std::string> *DictSet::GetPubDictEntryNames()
  *           values are lists of all the dictionnary entries among that
  *           group. Note that apparently the Dicom standard doesn't explicitely
  *           define a name (as a string) for each group.
+ *           NO ! Dicom Standard explicitely doesn't define 
+ *                any name, for any group !
  *          - A typical usage of this method would be to enable a dynamic
  *           configuration of a Dicom file browser: the admin/user can
  *           select in the interface which Dicom tags should be displayed.
@@ -126,25 +123,28 @@ std::list<std::string> *DictSet::GetPubDictEntryNames()
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.
  */
-std::map<std::string, std::list<std::string> > *
-   DictSet::GetPubDictEntryNamesByCategory() 
-{
-   return GetDefaultPubDict()->GetDictEntryNamesByCategory();
-}
+
+
+// Probabely useless!
+ 
+//EntryNamesByCatMap *DictSet::GetPubDictEntryNamesByCategory() 
+//{
+//   return GetDefaultPubDict()->GetDictEntryNamesByCategory();
+//}
 
 /**
  * \ingroup DictSet
  * \brief   Loads a dictionary from a specified file, and add it
  *          to already the existing ones contained in this DictSet.
- * @param   fileName Absolute or relative filename containing the
+ * @param   filename Absolute or relative filename containing the
  *          dictionary to load.
  * @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);
+   Dict *newDict = new Dict(filename);
    AppendDict(newDict, name);
 
    return newDict;
@@ -157,7 +157,7 @@ Dict *DictSet::LoadDictFromFile(std::string const & fileName,
  * @param   dictName The symbolic name of the searched dictionary.
  * \result  The retrieved dictionary.
  */
-Dict *DictSet::GetDict(DictKey const & dictName) 
+Dict *DictSet::GetDict(DictKey const &dictName) 
 {
    DictSetHT::iterator dict = Dicts.find(dictName);
    if(dict != Dicts.end())
@@ -172,26 +172,29 @@ Dict *DictSet::GetDict(DictKey const & dictName)
  *          in no dictionnary
  * @return  virtual entry
  */
-DictEntry *DictSet::NewVirtualDictEntry(uint16_t group,
-                                                uint16_t element,
-                                                std::string vr,
-                                                std::string fourth,
-                                                std::string name)
+DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
+                                         uint16_t element,
+                                         TagName vr,
+                                         TagName vm,
+                                         TagName name)
 {
-   DictEntry* entry;
+   DictEntry *entry;
    const std::string tag = DictEntry::TranslateToKey(group,element)
-                           + "#" + vr + "#" + fourth + "#" + name;
-   std::map<std::string,DictEntry *>::iterator it;
+                           + "#" + vr + "#" + vm + "#" + name;
+   TagKeyHT::iterator it;
    
    it = VirtualEntry.find(tag);
    if(it != VirtualEntry.end())
    {
-      entry = it->second;
+      entry = &(it->second);
    }
    else
    {
-      entry = new DictEntry(group, element, vr, fourth, name);
-      VirtualEntry[tag] = entry;
+      DictEntry ent(group, element, vr, vm, name);
+      VirtualEntry.insert(
+         std::map<TagKey, DictEntry>::value_type
+            (tag, ent));
+      entry = &(VirtualEntry.find(tag)->second);
    }
 
    return entry;
@@ -217,8 +220,8 @@ std::string DictSet::BuildDictPath()
       {
          resultPath += '/';
       }
-      dbg.Verbose(1, "DictSet::BuildDictPath:",
-                     "Dictionary path set from environnement");
+      gdcmVerboseMacro("DictSet::BuildDictPath:"
+                  "Dictionary path set from environnement");
    } 
    else
    {
@@ -230,11 +233,11 @@ std::string DictSet::BuildDictPath()
 
 //-----------------------------------------------------------------------------
 // Protected
-bool DictSet::AppendDict(Dict *newDict, DictKey const & name)
+bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
 {
    Dicts[name] = newDict;
 
-   return true;   //FIXME
+   return true;
 }
 
 //-----------------------------------------------------------------------------