X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=3acd3fc310fe3db56d154c6508c14b96024ade12;hb=659604feaaaf9519d03d59d66711f6b4b8290804;hp=645dcf855be65846dc5871302eafc8d4395dec02;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 645dcf85..3acd3fc3 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,158 +1,190 @@
 // gdcmDict.cxx
 
-#include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
+#include <fstream>
 
-gdcmDict::gdcmDict(const char* FileName) {
-	std::ifstream from(FileName);
-	dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", FileName);
-	guint16 group, element;
+/**
+ * \ingroup gdcmDict
+ * \brief   Construtor
+ * @param   FileName from which to build the 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;
 	// 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);
-		NameHt[name] = newEntry;
-		KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
-	}
-	from.close();
+   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();
 }
 
-void gdcmDict::Print(ostream& os) {
-	PrintByKey(os);
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ */
+gdcmDict::~gdcmDict() {
+   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) {
+      gdcmDictEntry* EntryToDelete = tag->second;
+      if ( EntryToDelete )
+         delete EntryToDelete;
+   }
+   KeyHt.clear();
+   // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
+   // assume all the pointed gdcmDictEntries are already cleaned-up when
+   // we cleaned KeyHt.
+   NameHt.clear();
 }
 
 /**
- * \ingroup gdcmHeader
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   os
+ */
+void gdcmDict::Print(std::ostream& os) {
+   PrintByKey(os);
+}
+
+/**
+ * \ingroup gdcmDict
  * \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 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;
+   }
 }
 
 /**
- * \ingroup gdcmHeader
+ * \ingroup gdcmDict
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          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;
+   }
 }
 
 /**
- * \ingroup gdcmHeader
+ * \ingroup gdcmDict
  * \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
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */
-gdcmDictEntry * gdcmDict::GetTagByKey(guint16 group, guint16 element) {
-	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
-	if ( ! KeyHt.count(key))
-		return (gdcmDictEntry*)0; 
-	if (KeyHt.count(key) > 1)
-		dbg.Verbose(0, "gdcmDict::GetTagByName", 
-		            "multiple entries for this key (FIXME) !");
-	return KeyHt.find(key)->second;
+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;
 }
 
 /**
- * \ingroup gdcmHeader
+ * \ingroup gdcmDict
  * \brief   Get the dictionnary entry identified by it's name.
  * @param   name element of the ElVal to modify
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */
 gdcmDictEntry * gdcmDict::GetTagByName(TagName name) {
-	if ( ! NameHt.count(name))
-		return (gdcmDictEntry*)0; 
-	if (NameHt.count(name) > 1)
-		dbg.Verbose(0, "gdcmDict::GetTagByName", 
-		            "multiple entries for this key (FIXME) !");
-	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) {
-	//JPRCLEAN
-	// au cas ou la NewEntry serait incomplete
-	// Question : cela peut-il se produire ?
-	//
-	// --> NON : voir constructeur
-	//TagKey key;
-	//key = NewEntry->GetKey();
-	//if (key =="") {
-	//	NewEntry->gdcmDictEntry::SetKey(
-	//			gdcmDictEntry::TranslateToKey(NewEntry->GetGroup(), NewEntry->GetElement())
-	//			);
-	//}
-	
-	KeyHt.erase (NewEntry->gdcmDictEntry::GetKey());
-	KeyHt[ NewEntry->GetKey()] = NewEntry;
-	return (1);
-	// Question(jpr): Dans quel cas ça peut planter ?
-	// Reponse(frog): dans les mauvais cas...
+   if ( RemoveEntry(NewEntry->gdcmDictEntry::GetKey()) ) {
+       KeyHt[ NewEntry->GetKey()] = NewEntry;
+       return (1);
+   } 
+   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);
-	}
-	}
-
-
-int gdcmDict::RemoveEntry(TagKey key) {	
-	if(KeyHt.count(key) == 1) {
-		KeyHt.erase(key);
-		return (1);
-	} else {
-		dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str());
-		return (0);
-	}
+   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;
+      if ( EntryToDelete )
+         delete EntryToDelete;
+      KeyHt.erase(key);
+      return (1);
+   } else {
+      dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str());
+      return (0);
+  }
+}
 
+/**
+ * \ingroup gdcmDict
+ * \brief   
+ * @param   group 
+ * @param   element
+ * @return  
+ */
 int gdcmDict::RemoveEntry (guint16 group, guint16 element) {
-
 	return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) );
 }