ENH: Untangle the transfer syntax from the Document. The Document can only read a...

[gdcm.git] / src / gdcmDict.cxx

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 722de05473ca4279e7d6344af2fe8892881ebba0..34180075979fb881bcfd5d248715c0213e98327e 100644 (file)
--- 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/07 09:03:52 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2005/01/08 15:03:59 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,13 +38,13 @@ Dict::Dict(std::string const &filename)
    uint16_t group;
    uint16_t element;
    TagName vr;
-   TagName fourth;
+   TagName vm;
    TagName name;
 
    std::ifstream from( filename.c_str() );
    if( !from )
    {
-      dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str());
+      gdcmVerboseMacro( "Can't open dictionary" << filename.c_str());
       // Using default embeded one:
       FillDefaultDataDict( this );
    }
@@ -56,11 +56,11 @@ Dict::Dict(std::string const &filename)
          from >> group;
          from >> element;
          from >> vr;
-         from >> fourth;
+         from >> vm;
          from >> std::ws;  //remove white space
          std::getline(from, name);
    
-         const DictEntry newEntry(group, element, vr, fourth, name);
+         const DictEntry newEntry(group, element, vr, vm, name);
          AddNewEntry(newEntry);
       }
 
@@ -89,16 +89,6 @@ Dict::~Dict()
 void Dict::Print(std::ostream &os)
 {
    os << "Dict file name : " << Filename << std::endl;
-   PrintByKey(os);
-}
-
-/**
- * \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.
- */
-void Dict::PrintByKey(std::ostream &os)
-{
    std::ostringstream s;
 
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
@@ -108,12 +98,13 @@ void Dict::PrintByKey(std::ostream &os)
       s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
         << std::dec;
       s << tag->second.GetVR() << ", ";
-      s << tag->second.GetFourth() << ", ";
+      s << tag->second.GetVM() << ", ";
       s << tag->second.GetName() << "."  << std::endl;
    }
    os << s.str();
 }
 
+
 //-----------------------------------------------------------------------------
 // Public
 /**
@@ -128,7 +119,7 @@ bool Dict::AddNewEntry(DictEntry const &newEntry)
 
    if(KeyHt.count(key) == 1)
    {
-      dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str());
+      gdcmVerboseMacro( "Already present" << key.c_str());
       return false;
    } 
    else 
@@ -166,14 +157,13 @@ bool Dict::RemoveEntry (TagKey const &key)
    TagKeyHT::const_iterator it = KeyHt.find(key);
    if(it != KeyHt.end()) 
    {
-      const DictEntry& entryToDelete = it->second;
       KeyHt.erase(key);
 
       return true;
    } 
    else 
    {
-      dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str());
+      gdcmVerboseMacro( "Unfound entry" << key.c_str());
       return false;
   }
 }
@@ -193,12 +183,12 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t elem)
 /**
  * \brief   Get the dictionnary entry identified by a given tag (group,element)
  * @param   group   group of the entry to be found
- * @param   element element of the entry to be found
+ * @param   elem element of the entry to be found
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */
-DictEntry *Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
+DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem)
 {
-   TagKey key = DictEntry::TranslateToKey(group, element);
+   TagKey key = DictEntry::TranslateToKey(group, elem);
    TagKeyHT::iterator it = KeyHt.find(key);
    if ( it == KeyHt.end() )
    {
@@ -213,15 +203,20 @@ DictEntry *Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
  * \sa      DictSet::GetPubDictTagNamesByCategory
  * @return  A list of all entries of the public dicom dictionnary.
  */
-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;
-}
+
+ 
+ // 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;
+//}
 
 /** 
  * \ingroup Dict
@@ -247,17 +242,20 @@ EntryNamesList *Dict::GetDictEntryNames()
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.
  */
-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;
-}
+ 
+ // 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;
+//}
 
 //-----------------------------------------------------------------------------
 // Protected