X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=6287e9aa522325a18510c310e401801b9ae41c3c;hb=0e0403151bbff57175d2b974ee2d14b8195f9234;hp=f15a753613325d9141bd471193d31acb00470b94;hpb=963480c814326423065a4a02fa1bf8bc1243ae4f;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index f15a7536..6287e9aa 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/18 11:39:59 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2005/01/24 14:14:11 $
+  Version:   $Revision: 1.70 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,7 +69,7 @@ Dict::Dict(std::string const &filename)
          std::getline(from, name);
    
          const DictEntry newEntry(group, element, vr, vm, name);
-         AddNewEntry(newEntry);
+         AddEntry(newEntry);
       }
 
       Filename = filename;
@@ -91,6 +91,7 @@ Dict::~Dict()
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
+ * @param indent Indentation string to be prepended during printing
  */
 void Dict::Print(std::ostream &os, std::string const & )
 {
@@ -128,7 +129,7 @@ void Dict::ClearEntry()
  * @param   newEntry entry to add 
  * @return  false if Dicom Element already exists
  */
-bool Dict::AddNewEntry(DictEntry const &newEntry) 
+bool Dict::AddEntry(DictEntry const &newEntry) 
 {
    const TagKey &key = newEntry.GetKey();
 
@@ -199,7 +200,7 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t elem)
  * @param   elem element of the entry to be found
  * @return  the corresponding dictionary entry when existing, NULL otherwise
  */
-DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem)
+DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
 {
    TagKey key = DictEntry::TranslateToKey(group, elem);
    TagKeyHT::iterator it = KeyHt.find(key);
@@ -210,65 +211,6 @@ DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem)
    return &(it->second);
 }
 
-/** 
- * \brief   Consider all the entries of the public dicom dictionary. 
- *          Build all list of all the tag names of all those entries.
- * \sa      DictSet::GetPubDictTagNamesByCategory
- * @return  A list of all entries of the public dicom dictionary.
- */
-
- 
- // Probabely useless
-  
- 
-//EntryNamesList *Dict::GetDictEntryNames() 
-//{
-//   EntryNamesList *result = new EntryNamesList;
-//   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
-//   {
-//      result->push_back( tag->second.GetName() );
-//   }
-//   return result;
-//}
-
-/** 
- * \brief   Consider all the entries of the public dicom dictionary.
- *          Build an hashtable whose keys are the names of the groups
- *          (fourth field in each line of dictionary) and whose corresponding
- *          values are lists of all the dictionary entries among that
- *          group. Note that apparently the Dicom standard doesn't explicitely
- *          define a name (as a string) for each 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.
- * \warning Dicom *doesn't* define any name for any 'categorie'
- *          (the dictionary fourth field was formerly NIH defined
- *           - and no longer he is-
- *           and will be removed when Dicom provides us a text file
- *           with the 'official' Dictionary, that would be more friendly
- *           than asking us to perform a line by line check of the dictionary
- *           at the beginning of each year to -try to- guess the changes)
- *           Therefore : please NEVER use that fourth field :-(
- *
- * @return  An hashtable: whose keys are the names of the groups and whose
- *          corresponding values are lists of all the dictionary entries
- *          among that group.
- */
- 
- // Probabely useless
- 
-//EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory() 
-//{
-//   EntryNamesByCatMap *result = new EntryNamesByCatMap;
-//
-//   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
-//   {
-//      (*result)[tag->second.GetFourth()].push_back(tag->second.GetName());
-//   }
-//
-//   return result;
-//}
-
 /**
  * \brief   Get the first entry while visiting the Dict entries
  * \return  The first DicEntry if found, otherwhise NULL