X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=f95f8d5469439fb9fc2f3290d3a1c31530cd1dba;hb=bd16605c78885c2c2bee82d88b3e2a7bd6707713;hp=d867b3da2cf38ece7ec886a5eed9607cffa9f394;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index d867b3da..f95f8d54 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/02/01 10:29:55 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2005/07/11 14:53:16 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
+/// \brief auto generate function, to fill up the Dicom Dictionnary,
+///       if relevant file is not found on user's disk
 void FillDefaultDataDict(Dict *d);
 
 //-----------------------------------------------------------------------------
@@ -52,15 +54,15 @@ Dict::Dict(std::string const &filename)
    TagName name;
 
    std::ifstream from( filename.c_str() );
-   if( !from )
+   if ( !from )
    {
-      gdcmVerboseMacro( "Can't open dictionary" << filename.c_str());
+      gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
       // Using default embeded one:
       FillDefaultDataDict( this );
    }
    else
    {
-      while (!from.eof())
+      while (!from.eof() && from)
       {
          from >> std::hex;
          from >> group;
@@ -89,16 +91,6 @@ Dict::~Dict()
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Remove all Dicom Dictionary Entries
- */
-void Dict::ClearEntry()
-{
-   // we assume all the pointed DictEntries are already cleaned-up
-   // when we clean KeyHt.
-   KeyHt.clear();
-}
-
 /**
  * \brief  adds a new Dicom Dictionary Entry 
  * @param   newEntry entry to add 
@@ -108,9 +100,9 @@ bool Dict::AddEntry(DictEntry const &newEntry)
 {
    const TagKey &key = newEntry.GetKey();
 
-   if(KeyHt.count(key) == 1)
+   if ( KeyHt.count(key) == 1 )
    {
-      gdcmVerboseMacro( "Already present" << key.c_str());
+      gdcmErrorMacro( "Already present:" << key );
       return false;
    } 
    else 
@@ -141,10 +133,10 @@ bool Dict::ReplaceEntry(DictEntry const &newEntry)
  * @param   key (group|element)
  * @return  false if Dicom Dictionary Entry doesn't exist
  */
-bool Dict::RemoveEntry (TagKey const &key) 
+bool Dict::RemoveEntry(TagKey const &key) 
 {
    TagKeyHT::const_iterator it = KeyHt.find(key);
-   if(it != KeyHt.end()) 
+   if ( it != KeyHt.end() ) 
    {
       KeyHt.erase(key);
 
@@ -152,7 +144,7 @@ bool Dict::RemoveEntry (TagKey const &key)
    } 
    else 
    {
-      gdcmVerboseMacro( "Unfound entry" << key.c_str());
+      gdcmWarningMacro( "Unfound entry" << key );
       return false;
   }
 }
@@ -164,17 +156,36 @@ bool Dict::RemoveEntry (TagKey const &key)
  * @param   elem Dicom element number of the Dicom Element
  * @return  false if Dicom Dictionary Entry doesn't exist
  */
-bool Dict::RemoveEntry (uint16_t group, uint16_t elem)
+bool Dict::RemoveEntry(uint16_t group, uint16_t elem)
 {
    return RemoveEntry(DictEntry::TranslateToKey(group, elem));
 }
 
 /**
- * \brief   Get the dictionary entry identified by a given tag (group,element)
- * @param   group   group of the entry to be found
- * @param   elem element of the entry to be found
+ * \brief   Remove all Dicom Dictionary Entries
+ */
+void Dict::ClearEntry()
+{
+   // we assume all the pointed DictEntries are already cleaned-up
+   // when we clean KeyHt.
+   KeyHt.clear();
+}
+
+/**
+ * \brief   Get the dictionary entry identified by a given tag ("group|element")
+ * @param   key   tag of the entry to be found
  * @return  the corresponding dictionary entry when existing, NULL otherwise
  */
+DictEntry *Dict::GetEntry(TagKey const &key)
+{
+   TagKeyHT::iterator it = KeyHt.find(key);
+   if ( it == KeyHt.end() )
+   {
+      return 0;
+   }
+   return &(it->second);
+}
+
 DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
 {
    TagKey key = DictEntry::TranslateToKey(group, elem);
@@ -193,7 +204,7 @@ DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem)
 DictEntry *Dict::GetFirstEntry()
 {
    ItKeyHt = KeyHt.begin();
-   if( ItKeyHt != KeyHt.end() )
+   if ( ItKeyHt != KeyHt.end() )
       return &(ItKeyHt->second);
    return NULL;
 }
@@ -207,11 +218,9 @@ DictEntry *Dict::GetNextEntry()
 {
    gdcmAssertMacro (ItKeyHt != KeyHt.end());
 
-   {
-      ++ItKeyHt;
-      if (ItKeyHt != KeyHt.end())
-         return &(ItKeyHt->second);
-   }
+   ++ItKeyHt;
+   if (ItKeyHt != KeyHt.end())
+      return &(ItKeyHt->second);
    return NULL;
 }