X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=d115e0a022fdc6c37f9545c5d441054347db34d7;hb=66553b88cd6daaac48ac62a910199cb2fff276f6;hp=2ad026e8f1c9dbc8732eb3d16b924148fa02b249;hpb=add079705405296ac0e1f811afbd0f237371dd52;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 2ad026e8..d115e0a0 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,12 +1,18 @@
 // gdcmDict.cxx
 
 #include <fstream>
-#include "gdcm.h"
+#include "gdcmDict.h"
 #include "gdcmUtil.h"
 
-gdcmDict::gdcmDict(const char* FileName) {
-	std::ifstream from(FileName);
-	dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", FileName);
+/**
+ * \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",
+                    FileName.c_str());
 	guint16 group, element;
 	// CLEANME : use defines for all those constants
 	char buff[1024];
@@ -26,18 +32,32 @@ gdcmDict::gdcmDict(const char* FileName) {
 		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();
 }
 
+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 allready cleaned-up when
+   // we cleaned KeyHt.
+   NameHt.clear();
+}
+
 void gdcmDict::Print(ostream& os) {
 	PrintByKey(os);
 }
 
 /**
- * \ingroup gdcmHeader
+ * \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.
@@ -54,7 +74,7 @@ void gdcmDict::PrintByKey(ostream& os) {
 }
 
 /**
- * \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.
@@ -71,24 +91,21 @@ void gdcmDict::PrintByName(ostream& os) {
 }
 
 /**
- * \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) {
+gdcmDictEntry * gdcmDict::GetTagByNumber(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;
 }
 
 /**
- * \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
@@ -96,63 +113,47 @@ gdcmDictEntry * gdcmDict::GetTagByKey(guint16 group, guint16 element) {
 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;
 }
 
-
 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();
 	
-	if(KeyHt.count(key) >= 1) {
-		printf("gdcmDict::AddNewEntry %s deja present\n", key.c_str());
+	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 {
-		printf("gdcmDict::RemoveEntry %s non trouve\n", key.c_str());
-		return (0);
-	}
+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);
+  }
 }
 
 
 int gdcmDict::RemoveEntry (guint16 group, guint16 element) {
-
 	return( RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)) );
 }