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

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index f8bb4f35..02063318 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/01/18 07:50:58 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.57 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,7 @@ DictSet::DictSet()
  */
 DictSet::~DictSet() 
 {
-   // Remove dictionnaries
+   // Remove dictionaries
    for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
    {
       Dict *entryToDelete = tag->second;
@@ -59,74 +59,8 @@ DictSet::~DictSet()
    VirtualEntry.clear();
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Print, in an informal fashion, the list of all the dictionaries
- *          contained is this DictSet, along with their respective content.
- * @param   os Output stream used for printing.
- */
-void DictSet::Print(std::ostream &os, std::string const & )
-{
-   for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
-   {
-      os << "Printing dictionary " << dict->first << std::endl;
-      dict->second->Print(os);
-   }
-}
-
 //-----------------------------------------------------------------------------
 // Public
-/** 
- * \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 *DictSet::GetPubDictEntryNames() 
-//{
-//   return GetDefaultPubDict()->GetDictEntryNames();
-//}
-
-/** 
- * \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.
- *           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.
- * \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 *DictSet::GetPubDictEntryNamesByCategory() 
-//{
-//   return GetDefaultPubDict()->GetDictEntryNamesByCategory();
-//}
-
 /**
  * \brief   Loads a dictionary from a specified file, and add it
  *          to already the existing ones contained in this DictSet.
@@ -195,10 +129,10 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
 
 /**
  * \brief   Obtain from the GDCM_DICT_PATH environnement variable the
- *          path to directory containing the dictionnaries. When
+ *          path to directory containing the dictionaries. When
  *          the environnement variable is absent the path is defaulted
  *          to "../Dicts/".
- * @return  path to directory containing the dictionnaries
+ * @return  path to directory containing the dictionaries
  */
 std::string DictSet::BuildDictPath() 
 {
@@ -223,7 +157,6 @@ std::string DictSet::BuildDictPath()
    return resultPath;
 }
 
-
 /**
  * \brief   Get the first entry while visiting the DictSet
  * \return  The first Dict if found, otherwhise NULL
@@ -231,7 +164,9 @@ std::string DictSet::BuildDictPath()
 Dict *DictSet::GetFirstEntry()
 {
    ItDictHt = Dicts.begin();
-   return ItDictHt->second;
+   if( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
 }
 
 /**
@@ -241,22 +176,16 @@ Dict *DictSet::GetFirstEntry()
  */
 Dict *DictSet::GetNextEntry()
 {
-   if (ItDictHt != Dicts.end())
-   {
-      Dict *tmp = ItDictHt->second;
-      ++ItDictHt;
-
-      return tmp;
-   }
-   else
-   {
-      return NULL;
-   }
+   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
@@ -272,5 +201,21 @@ bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print, in an informal fashion, the list of all the dictionaries
+ *          contained is this DictSet, along with their respective content.
+ * @param   os Output stream used for printing.
+ * @param indent Indentation string to be prepended during printing
+ */
+void DictSet::Print(std::ostream &os, std::string const & )
+{
+   for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
+   {
+      os << "Printing dictionary " << dict->first << std::endl;
+      dict->second->Print(os);
+   }
+}
 
+//-----------------------------------------------------------------------------
 } // end namespace gdcm