X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=25de9bba0d7bd277b6c53caa0bc34d37a1c6893a;hb=ecc068684313c5f9f1050de920afc7e413041220;hp=d115e0a022fdc6c37f9545c5d441054347db34d7;hpb=0457e1e8fc68df6d9e2d1a0fcd0053ecee3c5ad7;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index d115e0a0..25de9bba 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,44 +1,49 @@
 // gdcmDict.cxx
 
-#include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
+#include <fstream>
 
 /**
  * \ingroup gdcmDict
  * \brief   Construtor
  * @param   FileName from which to build the dictionary.
  */
-gdcmDict::gdcmDict(string & FileName) {
-	std::ifstream from(FileName.c_str());
-	dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary",
+gdcmDict::gdcmDict(std::string & FileName) {
+   std::ifstream from(FileName.c_str());
+   dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary",
                     FileName.c_str());
-	guint16 group, element;
+   guint16 group, element;
 	// CLEANME : use defines for all those constants
-	char buff[1024];
-	TagKey key;
-	TagName vr;
-	TagName fourth;
-	TagName name;
-	while (!from.eof()) {
-		from >> hex >> group >> element;
-		eatwhite(from);
-		from.getline(buff, 256, ' ');
-		vr = buff;
-		eatwhite(from);
-		from.getline(buff, 256, ' ');
-		fourth = buff;
-		from.getline(buff, 256, '\n');
-		name = buff;
-		gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
-		                                         vr, fourth, name);
+   char buff[1024];
+   TagKey key;
+   TagName vr;
+   TagName fourth;
+   TagName name;
+
+   while (!from.eof()) {
+      from >> std::hex >> group >> element;
+      eatwhite(from);
+      from.getline(buff, 256, ' ');
+      vr = buff;
+      eatwhite(from);
+      from.getline(buff, 256, ' ');
+      fourth = buff;
+      from.getline(buff, 256, '\n');
+      name = buff;
+      gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
+		                                   vr, fourth, name);
       // FIXME: use AddNewEntry
-		NameHt[name] = newEntry;
-		KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
-	}
-	from.close();
+      NameHt[name] = newEntry;
+      KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
+   }
+   from.close();
 }
 
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ */
 gdcmDict::~gdcmDict() {
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) {
       gdcmDictEntry* EntryToDelete = tag->second;
@@ -47,13 +52,18 @@ gdcmDict::~gdcmDict() {
    }
    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();
 }
 
-void gdcmDict::Print(ostream& os) {
-	PrintByKey(os);
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   os
+ */
+void gdcmDict::Print(std::ostream& os) {
+   PrintByKey(os);
 }
 
 /**
@@ -62,15 +72,15 @@ void gdcmDict::Print(ostream& os) {
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
  */
-void gdcmDict::PrintByKey(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 << tag->second->GetVR() << ", ";
-		os << tag->second->GetFourth() << ", ";
-		os << tag->second->GetName() << "."  << endl;
-	}
+void gdcmDict::PrintByKey(std::ostream& os) {
+   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
+      os << "Tag : ";
+      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() << "."  << std::endl;
+   }
 }
 
 /**
@@ -79,15 +89,15 @@ void gdcmDict::PrintByKey(ostream& os) {
  *          Entries will be sorted by the name of the dictionary entries.
  * @param   os The output stream to be written to.
  */
-void gdcmDict::PrintByName(ostream& os) {
-	for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){
-		os << "Tag : ";
-		os << tag->second->GetName() << ",";
-		os << tag->second->GetVR() << ", ";
-		os << tag->second->GetFourth() << ", ";
-		os << "(" << hex << tag->second->GetGroup() << ',';
-		os << hex << tag->second->GetElement() << ") = " << dec << endl;
-	}
+void gdcmDict::PrintByName(std::ostream& os) {
+   for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag){
+      os << "Tag : ";
+      os << tag->second->GetName() << ",";
+      os << tag->second->GetVR() << ", ";
+      os << tag->second->GetFourth() << ", ";
+      os << "(" << std::hex << tag->second->GetGroup() << ',';
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl;
+   }
 }
 
 /**
@@ -98,10 +108,10 @@ void gdcmDict::PrintByName(ostream& os) {
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */
 gdcmDictEntry * gdcmDict::GetTagByNumber(guint16 group, guint16 element) {
-	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
-	if ( ! KeyHt.count(key))
-		return (gdcmDictEntry*)0; 
-	return KeyHt.find(key)->second;
+   TagKey key = gdcmDictEntry::TranslateToKey(group, element);
+   if ( ! KeyHt.count(key))
+      return (gdcmDictEntry*)0; 
+   return KeyHt.find(key)->second;
 }
 
 /**
@@ -111,11 +121,17 @@ gdcmDictEntry * gdcmDict::GetTagByNumber(guint16 group, guint16 element) {
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */
 gdcmDictEntry * gdcmDict::GetTagByName(TagName name) {
-	if ( ! NameHt.count(name))
-		return (gdcmDictEntry*)0; 
-	return NameHt.find(name)->second;
+   if ( ! NameHt.count(name))
+      return (gdcmDictEntry*)0; 
+   return NameHt.find(name)->second;
 }
 
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   NewEntry
+ * @return  
+ */
 int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
    if ( RemoveEntry(NewEntry->gdcmDictEntry::GetKey()) ) {
        KeyHt[ NewEntry->GetKey()] = NewEntry;
@@ -124,21 +140,31 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) {
    return (0);
 }
 
-int gdcmDict::AddNewEntry(gdcmDictEntry* NewEntry) {
-
-	TagKey key;
-	key = NewEntry->GetKey();
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   NewEntry
+ * @return  
+ */
+ int gdcmDict::AddNewEntry(gdcmDictEntry* NewEntry) {
+   TagKey key;
+   key = NewEntry->GetKey();
 	
-	if(KeyHt.count(key) == 1) {
-		dbg.Verbose(1, "gdcmDict::AddNewEntry allready present", key.c_str());
-		return(0);
-	} else {
-		KeyHt[NewEntry->GetKey()] = NewEntry;
-		return(1);
-	}
+   if(KeyHt.count(key) == 1) {
+      dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
+      return(0);
+   } else {
+      KeyHt[NewEntry->GetKey()] = NewEntry;
+      return(1);
+   }
 }
 
-
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   key
+ * @return  
+ */
 int gdcmDict::RemoveEntry(TagKey key) {
    if(KeyHt.count(key) == 1) {
       gdcmDictEntry* EntryToDelete = KeyHt.find(key)->second;
@@ -152,7 +178,13 @@ int gdcmDict::RemoveEntry(TagKey key) {
   }
 }
 
-
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   group 
+ * @param   element
+ * @return  
+ */
 int gdcmDict::RemoveEntry (guint16 group, guint16 element) {
 	return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) );
 }