X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=5744e79040aebb373879a1700c87bd1ee808de1b;hb=3d97b50735592503af76b85e3d483766765cfae3;hp=6287e9aa522325a18510c310e401801b9ae41c3c;hpb=0a9f25290006bdee6be492179f8b0dae7ba1c598;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 6287e9aa..5744e790 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/24 14:14:11 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2005/09/02 07:00:04 $
+  Version:   $Revision: 1.79 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,11 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the Dicom Dictionnary,
+///       if relevant file is not found on user's disk
 void FillDefaultDataDict(Dict *d);
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -43,37 +47,18 @@ Dict::Dict( )
  */
 Dict::Dict(std::string const &filename)
 {
-   uint16_t group;
-   uint16_t element;
-   TagName vr;
-   TagName vm;
-   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())
-      {
-         from >> std::hex;
-         from >> group;
-         from >> element;
-         from >> vr;
-         from >> vm;
-         from >> std::ws;  //remove white space
-         std::getline(from, name);
-   
-         const DictEntry newEntry(group, element, vr, vm, name);
-         AddEntry(newEntry);
-      }
-
+      DoTheLoadingJob(from);
       Filename = filename;
-      from.close();
    }
 }
 
@@ -86,42 +71,66 @@ Dict::~Dict()
 }
 
 //-----------------------------------------------------------------------------
-// Print
+// Public
+
 /**
- * \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
+ * \brief   Add a all the entries held in a source dictionary
+ * \note it concerns only Private Dictionnary
+ * @param   filename from which to build the dictionary.
  */
-void Dict::Print(std::ostream &os, std::string const & )
+bool Dict::AddDict(std::string const &filename)
 {
-   os << "Dict file name : " << Filename << std::endl;
-   std::ostringstream s;
 
-   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
+   std::ifstream from( filename.c_str() );
+   if ( !from )
    {
-      s << "Entry : ";
-      s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
-      s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
-        << std::dec;
-      s << tag->second.GetVR() << ", ";
-      s << tag->second.GetVM() << ", ";
-      s << tag->second.GetName() << "."  << std::endl;
+      gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
+      return false;
+   }
+   else
+   {
+      DoTheLoadingJob(from);
+      return true;
    }
-   os << s.str();
 }
 
 
-//-----------------------------------------------------------------------------
-// Public
 /**
- * \brief   Remove all Dicom Dictionary Entries
+ * \brief   Removes from the current Dicom Dict all the entries held in a source dictionary
+ * \note it concerns only Private Dictionnary
+ * @param   filename from which we read the entries to remove.
  */
-void Dict::ClearEntry()
+bool Dict::RemoveDict(std::string const &filename)
 {
-   // we assume all the pointed DictEntries are already cleaned-up
-   // when we clean KeyHt.
-   KeyHt.clear();
+   std::ifstream from( filename.c_str() );
+   if ( !from )
+   {
+      gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
+      return false;
+   }
+   else
+   {
+      uint16_t group;
+      uint16_t elem;
+      TagName vr;
+      TagName vm;
+      TagName name;
+
+      while (!from.eof() && from)
+      {
+         from >> std::hex;
+         from >> group;
+         from >> elem;
+         from >> vr;
+         from >> vm;
+        // from >> std::ws;  //remove white space
+         std::getline(from, name);
+ 
+        RemoveEntry(DictEntry::TranslateToKey(group, elem));
+      }
+      from.close();
+      return true;
+   }
 }
 
 /**
@@ -133,9 +142,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 
@@ -166,10 +175,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);
 
@@ -177,7 +186,7 @@ bool Dict::RemoveEntry (TagKey const &key)
    } 
    else 
    {
-      gdcmVerboseMacro( "Unfound entry" << key.c_str());
+      gdcmWarningMacro( "Unfound entry" << key );
       return false;
   }
 }
@@ -189,17 +198,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);
@@ -218,7 +246,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;
 }
@@ -232,11 +260,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;
 }
 
@@ -245,7 +271,58 @@ DictEntry *Dict::GetNextEntry()
 
 //-----------------------------------------------------------------------------
 // Private
+/**
+ * \brief Add all the dictionary entries from an already open source file 
+ * @param from input stream to read from.
+ */
+void Dict::DoTheLoadingJob(std::ifstream &from)
+{
+   uint16_t group;
+   uint16_t elem;
+   TagName vr;
+   TagName vm;
+   TagName name;
 
+   while (!from.eof() && from)
+   {
+      from >> std::hex;
+      from >> group;
+      from >> elem;
+      from >> vr;
+      from >> vm;
+      from >> std::ws;  //remove white space
+      std::getline(from, name);
+ 
+      const DictEntry newEntry(group, elem, vr, vm, name);
+      AddEntry(newEntry);
+   }
+   from.close();
+}
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \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 & )
+{
+   os << "Dict file name : " << Filename << std::endl;
+   std::ostringstream s;
 
+   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
+   {
+      s << "Entry : ";
+      s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
+      s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
+        << std::dec;
+      s << tag->second.GetVR() << ", ";
+      s << tag->second.GetVM() << ", ";
+      s << tag->second.GetName() << "."  << std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm