* src/gdcmDictSet.h : set the method BuildDictPath in public

[gdcm.git] / src / gdcmDict.cxx

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 0ac31dad235b477b46b125133ba213134d16ef69..25de9bba0d7bd277b6c53caa0bc34d37a1c6893a 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,9 +1,8 @@
 // gdcmDict.cxx
 
-#include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
-using namespace std;
+#include <fstream>
 
 /**
  * \ingroup gdcmDict
@@ -21,6 +20,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
    TagName vr;
    TagName fourth;
    TagName name;
+
    while (!from.eof()) {
       from >> std::hex >> group >> element;
       eatwhite(from);
@@ -32,7 +32,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
       from.getline(buff, 256, '\n');
       name = buff;
       gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
-                                                        vr, fourth, name);
+                                                  vr, fourth, name);
       // FIXME: use AddNewEntry
       NameHt[name] = newEntry;
       KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
@@ -43,10 +43,8 @@ gdcmDict::gdcmDict(std::string & FileName) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
- * @return  
  */
- gdcmDict::~gdcmDict() {
+gdcmDict::~gdcmDict() {
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) {
       gdcmDictEntry* EntryToDelete = tag->second;
       if ( EntryToDelete )
@@ -54,7 +52,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
    }
    KeyHt.clear();
    // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
-   // assume all the pointed gdcmDictEntries are allready cleaned-up when
+   // assume all the pointed gdcmDictEntries are already cleaned-up when
    // we cleaned KeyHt.
    NameHt.clear();
 }
@@ -62,8 +60,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
- * @return  
+ * @param   os
  */
 void gdcmDict::Print(std::ostream& os) {
    PrintByKey(os);
@@ -78,11 +75,11 @@ void gdcmDict::Print(std::ostream& os) {
 void gdcmDict::PrintByKey(std::ostream& os) {
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
       os << "Tag : ";
-      os << "(" << hex << tag->second->GetGroup() << ',';
-      os << hex << tag->second->GetElement() << ") = " << dec;
+      os << "(" << std::hex << tag->second->GetGroup() << ',';
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec;
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
-      os << tag->second->GetName() << "."  << endl;
+      os << tag->second->GetName() << "."  << std::endl;
    }
 }
 
@@ -99,7 +96,7 @@ void gdcmDict::PrintByName(std::ostream& os) {
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
       os << "(" << std::hex << tag->second->GetGroup() << ',';
-      os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl;
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl;
    }
 }
 
@@ -132,7 +129,7 @@ gdcmDictEntry * gdcmDict::GetTagByName(TagName name) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
+ * @param   NewEntry
  * @return  
  */
 int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
@@ -146,7 +143,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
+ * @param   NewEntry
  * @return  
  */
  int gdcmDict::AddNewEntry(gdcmDictEntry* NewEntry) {
@@ -154,7 +151,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
    key = NewEntry->GetKey();
        
    if(KeyHt.count(key) == 1) {
-      dbg.Verbose(1, "gdcmDict::AddNewEntry allready present", key.c_str());
+      dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
       return(0);
    } else {
       KeyHt[NewEntry->GetKey()] = NewEntry;
@@ -165,7 +162,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
+ * @param   key
  * @return  
  */
 int gdcmDict::RemoveEntry(TagKey key) {
@@ -184,7 +181,8 @@ int gdcmDict::RemoveEntry(TagKey key) {
 /**
  * \ingroup gdcmDict
  * \brief   
- * @param   
+ * @param   group 
+ * @param   element
  * @return  
  */
 int gdcmDict::RemoveEntry (guint16 group, guint16 element) {